Commit Graph

636043 Commits

Author SHA1 Message Date
Nan Li
a0de710366 emmc: add sd emmc driver
PD#138714: add sd/emmc driver support
1 add emmc hs200/hs400 mode
2 add sd highspeed mode
3 add sd hotplug detect
4 add emmc clock tree supported
5 add sdio get_wifi_inf & sdio_reinit
6 add partitions on dts
7 add sd/emmc pinmux set

Change-Id: I449e61517844cb4cb9ad3aaa2f79c911e8658356
Signed-off-by: Nan Li <nan.li@amlogic.com>
2017-03-08 19:02:59 -08:00
Yun Cai
260c6d8c9b clocktree: update misc clk
PD#138714: update misc clock for gxl

Change-Id: I9cf067ba8c39fbcfa5fe17671f3bd6a9ec890263
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-03-08 18:06:33 -08:00
Xingyu Chen
1c522dcb6f remote: add remote driver
PD#138714: initial add remote driver

temporarily disable the feature which reporting event after system resume,
and it will be enabled after the 'amlogic/pm' driver is available.

Change-Id: I57312621557f050401b5028b7607144cb9a9351f
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
2017-03-08 20:18:42 +08:00
Jianxin Pan
4d207f9ec2 pinctrl: fix gpio irq and pinmux bugs
PD#138714: fix gpio irq and pinmux bugs
1. fix gpio irq issue
2. fix clear pinmux error when get gpio
3. fix emmc_ds mux

Change-Id: I983989a4f96b61c29c9043c30ffc4ce62c31a7ab
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2017-03-07 23:06:47 -08:00
Zongdong Jiao
abf5acf549 hdmitx: add hdmitx driver
PD#138714: add hdmitx driver

Change-Id: Iffe4a2a88633d3e3d67ba1aec4c6ea5c2a912aec
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2017-03-08 14:49:51 +08:00
Pengcheng Chen
4dafe9905e media: add osd & ge2d driver
PD#138714: add osd & ge2d driver

Change-Id: I70c0e1e2b5e29a158b8a41e27bbc4db2fd49bb9a
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-03-07 03:47:53 -08:00
Evoke Zhang
384fc38e44 vout: add vout serve driver
138714: initial add vout serve driver

Change-Id: Ib6620d3fc89bd43f7d362b6ac911a011b5052ed3
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2017-03-06 19:55:47 +08:00
Evoke Zhang
7dd2bd23a8 vpu: add vpu driver
PD#138714: initial add vpu driver

Change-Id: I84a8c00082b393f417ffdd1a155346cc6272743b
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2017-03-06 19:54:21 +08:00
Nanxin Qin
c1b39e0614 media: add the common of the multimedia.
PD#138714: initial add common part of mm

Change-Id: I58265ba464b3ec6dd819275cfaa385acb706c6db
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2017-03-02 15:20:14 +08:00
Jian Hu
76b338ae5f pwm: add pwm driver
PD#138714: initial add pwm driver

Change-Id: Ief5a3432642b8f2de8fecffaf51b5c055c696078
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2017-02-28 12:32:26 +08:00
Jianxin Pan
8a3ce8ddbc hotplug: add cpu hotplug support
PD#138714: add cpu hotplug
Split cpu hotplug from cpufreq_hotplug. Cpu hotplug is not depend on
cpufreq_hotplug.

Change-Id: I4888f6d046e26561166b55aab48ca0a4b0ac9dd3
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2017-02-28 12:24:39 +08:00
Yizhou Jiang
467f3a6a87 ethernet: initial add the MAC and PHY driver
PD#131267: eth: initial add the MAC and PHY driver

1.internal eth phy supported
2.external eth phy supported
3.internal external phy can be switched by modify dts file

Change-Id: Id5e17b7fe0bef31ccf1c56d86764ef4bcb610a46
Signed-off-by: Yizhou Jiang <yizhou.jiang@amlogic.com>
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2017-02-28 12:20:33 +08:00
Xuhua Zhang
f4f9e5f344 i2c: add aml i2c driver
PD#138714: initial add amlogic i2c driver.

Change-Id: Ifdcaa41eb1ab7d2dd88ac065332c29b67f169505
Signed-off-by: Xuhua Zhang <xuhua.zhang@amlogic.com>
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2017-02-26 23:46:02 -08:00
Xingyu Chen
d0019c3342 pinctrl: gpio irq support
PD#138714:: gpio irq support

Change-Id: Ia374362f38b9b5e830dbac252c337869a9206744
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
2017-02-22 19:55:39 +08:00
Jianxin Pan
2a780f9beb cpufreq: enable scpi cpufreq
PD#138714: add scpi_cpufreq

Change-Id: Iaf90f7573657593f21200fed48209a2758fa189a
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2017-02-17 17:18:46 +08:00
Yue Wang
3427c5f8a1 usb: initial add the controller and phy drivers
PD#138714: add usb host and device.

Change-Id: I9fc3c86e97a3bb69f419b1b4148ed6e843bd4e8e
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2017-02-17 13:11:30 +08:00
Jianxin Pan
7848e45ecb reboot: enable reboot on gxm and gxl
PD#138714: enable reboot on gxm and gxl

Change-Id: I4375aaa546d67b093fd2268bc27e805c9dce8091
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2017-02-15 20:02:54 +08:00
Yun Cai
679b15ab94 efuse: add efuse support
PD#138714: initialize efuse driver

Change-Id: I09c02fc2b6ecebdf714c1f2dd2c8ffc6496d42e1
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-02-13 20:27:53 +08:00
Xingyu Chen
fba6d02ae8 adc_keypad: add adc keypad driver
PD#138714: initial add adc keypad driver
1.add input/keyboard
2.add bindings/amlogic/input/amlogic-adc-keypad.txt

Change-Id: I432e2b571dbfef870155ba78e4e4d49ebb11a24b
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
2017-02-12 06:26:07 -08:00
Yun Cai
fcd7061745 clocktree: add misc clock
PD#138714: add misc clock for gxl

Change-Id: I64a0fe72536ec335fa7eff18838a13fbcf99f91e
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-02-09 19:38:03 +08:00
Xingyu Chen
d4d32dd85f saradc: add saradc driver for gxl/gxm
PD#138714: initial add saradc driver
1.add input/saradc
2.saradc support in gxl
3.saradc support in gxm
4.add bindings/amlogic/input/amlogic-saradc.txt

Change-Id: I95f523300c453d59bea6a3e92b962cbb195b613c
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
2017-02-09 08:50:08 +08:00
Matthew Shyu
8a62dc1f10 crypto: hardware crypto engine support
PD#138714: init add Hardware crypto engine support
Amlogic hardware crypto driver for AES-128/192/256-CBC,
AES-128/192-256-CTR, DES3-EDE-CBC, SHA1, SHA2, SHA256, HMAC

Change-Id: I6d690f46222c84164021f3bd6244c708b476f6f0
Signed-off-by: Matthew Shyu <matthew.shyu@amlogic.com>
2017-02-08 00:45:24 -08:00
Yun Cai
b92947e75d clocktree: fix gxl clk81/reset definition issue
PD#138714: fix gxl clock tree definition issue

Change-Id: I521e12a8150a9c1e28c8deb8e69d5969f27e16aa
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-02-08 11:30:15 +08:00
Jianxin Pan
5310f66400 defconfig: add small,tiny and compact defconfigs
PD#138714: add defconfigs
1.tiny: fewest configs for booting to console
2.small: nessary configs, not include dvfs,hotplug,mailbox
3.compact: normal configs, include dvfs,hotplug.no more drivers

Change-Id: If9a0793a1ddad5cd696052dca11e46f2203b92a6
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2017-02-04 00:27:24 -08:00
Yun Cai
d223312a0a clk: add amlogic clock tree driver
PD#138714: amlogic clock tree drivers for
cpu/pll/gpu/sdemmc/media/reset/clkmsr/test

Change-Id: I861ab8983eea4b6339f07ae3fb417b39e3893929
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-02-04 00:20:40 -08:00
Yun Cai
f79bffd6eb meson: add timer/cpu_info/cpu_version/mailbox/reg_access/secmon drivers
PD#138714: add base amlogic drivers
bc timer/cpu_info/cpu_version/mailbox/reg_access/secmon

Change-Id: If45019748dbdc646300ecd67fda2a04f03b7ea52
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-02-04 00:09:54 -08:00
Jianxin Pan
8cd9ca2e48 printk: add cpu id in printk message
PD#138714: add cpu id in printk message

Change-Id: Ic3efb64b8675d2e03129c5a646f53e60fbf8c78d
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2017-02-04 10:52:45 +08:00
Jianxin Pan
39c7bcad55 pinctrl: initial add pinmux
PD#138714: initial add pinmux and gpio

Change-Id: I5154faab7508d066a302170fbb02b319413c8ea0
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2017-01-20 17:28:36 +08:00
Jianxin Pan
e655ebfcdc meson64: first commit
PD#138714: initial commit for meson64 bringup
1. add meson64 defconfig
2. add uart driver
3. add iomap driver
4. add scripts
5. add p212 & q200 dts

Change-Id: Idbc0d4e33f024eaeb97fc9f7948188b9596aea4c
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2017-01-19 19:00:52 +08:00
Greg Kroah-Hartman
75353ac8ff Linux 4.9.4 2017-01-15 13:43:07 +01:00
Larry Finger
6fea974494 rtlwifi: rtl_usb: Fix missing entry in USB driver's private data
commit 60f59ce027 upstream.

These drivers need to be able to reference "struct ieee80211_hw" from
the driver's private data, and vice versa. The USB driver failed to
store the address of ieee80211_hw in the private data. Although this
bug has been present for a long time, it was not exposed until
commit ba9f93f82a ("rtlwifi: Fix enter/exit power_save").

Fixes: ba9f93f82a ("rtlwifi: Fix enter/exit power_save")
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-01-15 13:42:58 +01:00
Larry Finger
7dae85b5c3 rtlwifi: Fix enter/exit power_save
commit ba9f93f82a upstream.

In commit a5ffbe0a19 ("rtlwifi: Fix scheduling while atomic bug") and
commit a269913c52 ("rtlwifi: Rework rtl_lps_leave() and rtl_lps_enter()
to use work queue"), an error was introduced in the power-save routines
due to the fact that leaving PS was delayed by the use of a work queue.

This problem is fixed by detecting if the enter or leave routines are
in interrupt mode. If so, the workqueue is used to place the request.
If in normal mode, the enter or leave routines are called directly.

Fixes: a269913c52 ("rtlwifi: Rework rtl_lps_leave() and rtl_lps_enter() to use work queue")
Reported-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-01-15 13:42:57 +01:00
Imre Deak
3f41ee3a45 drm/i915/gen9: Fix PCODE polling during CDCLK change notification
commit 2c7d0602c8 upstream.

commit 848496e590
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date:   Wed Jul 13 16:32:03 2016 +0300

    drm/i915: Wait up to 3ms for the pcu to ack the cdclk change request on SKL

increased the timeout to match the spec, but we still see a timeout on
at least one SKL. A CDCLK change request following the failed one will
succeed nevertheless.

I could reproduce this problem easily by running kms_pipe_crc_basic in a
loop. In all failure cases _wait_for() was pre-empted for >3ms and so in
the worst case - when the pre-emption happened right after calculating
timeout__ in _wait_for() - we called skl_cdclk_wait_for_pcu_ready() only
once which failed and so _wait_for() timed out. As opposed to this the
spec says to keep retrying the request for at most a 3ms period.

To fix this send the first request explicitly to guarantee that there is
3ms between the first and last request. Though this matches the spec, I
noticed that in rare cases this can still time out if we sent only a few
requests (in the worst case 2) _and_ PCODE is busy for some reason even
after a previous request and a 3ms delay. To work around this retry the
polling with pre-emption disabled to maximize the number of requests.
Also increase the timeout to 10ms to account for interrupts that could
reduce the number of requests. With this change I couldn't trigger
the problem.

v2:
- Use 1ms poll period instead of 10us. (Chris)
v3:
- Poll with pre-emption disabled to increase the number of request
  attempts. (Ville, Chris)
- Factor out a helper to poll, it's also needed by the next patch.
v4:
- Pass reply_mask, reply to skl_pcode_request(), instead of assuming the
  reply is generic. (Ville)
v5:
- List the request specific timeout values as code comment. (Ville)
v6:
- Try the poll first with preemption enabled.
- Add code comment about first request being queued by PCODE. (Art)
- Add timeout_base_ms argument. (Ville)
v7:
- Clarify code comment about first queued request. (Chris)

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Art Runyan <arthur.j.runyan@intel.com>
Cc: <stable@vger.kernel.org> # v4.2- : 3b2c171 : drm/i915: Wait up to 3ms
Cc: <stable@vger.kernel.org> # v4.2-
Fixes: 5d96d8afcf ("drm/i915/skl: Deinit/init the display at suspend/resume")
Reference: https://bugs.freedesktop.org/show_bug.cgi?id=97929
Testcase: igt/kms_pipe_crc_basic/suspend-read-crc-pipe-B
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1480955258-26311-1-git-send-email-imre.deak@intel.com
(cherry picked from commit a0b8a1fe34)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-01-15 13:42:57 +01:00
Dennis Kadioglu
93f2976eb0 ALSA: usb-audio: Add a quirk for Plantronics BT600
commit 2e40795c3b upstream.

Plantronics BT600 does not support reading the sample rate which leads
to many lines of "cannot get freq at ep 0x1" and "cannot get freq at
ep 0x82". This patch adds the USB ID of the BT600 to quirks.c and
avoids those error messages.

Signed-off-by: Dennis Kadioglu <denk@post.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-01-15 13:42:57 +01:00
Uwe Kleine-König
f52e670a5b spi: mvebu: fix baudrate calculation for armada variant
commit 7243e0b207 upstream.

The calculation of SPR and SPPR doesn't round correctly at several
places which might result in baud rates that are too big. For example
with tclk_hz = 250000001 and target rate 25000000 it determined a
divider of 10 which is wrong.

Instead of fixing all the corner cases replace the calculation by an
algorithm without a loop which should even be quicker to execute apart
from being correct.

Fixes: df59fa7f4b ("spi: orion: support armada extended baud rates")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-01-15 13:42:57 +01:00
Grygorii Strashko
05b7bdf1c3 ARM: omap2+: am437x: rollback to use omap3_gptimer_timer_init()
commit f86a2c875f upstream.

The commit 55ee7017ee ("arm: omap2: board-generic: use
omap4_local_timer_init for AM437x") unintentionally changes the
clocksource devices for AM437x from OMAP GP Timer to SyncTimer32K.

Unfortunately, the SyncTimer32K is starving from frequency deviation
as mentioned in commit 5b5c013591 ("ARM: OMAP2+: AM43x: Use gptimer
as clocksource") and, as reported by Franklin [1], even its monotonic
nature is under question (most probably there is a HW issue, but it's
still under investigation).

Taking into account above facts It's reasonable to rollback to the use
of omap3_gptimer_timer_init().

[1] http://www.spinics.net/lists/linux-omap/msg127425.html

Fixes: 55ee7017ee ("arm: omap2: board-generic: use
omap4_local_timer_init for AM437x")
Reported-by: Cooper Jr., Franklin <fcooper@ti.com>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-01-15 13:42:57 +01:00
Geert Uytterhoeven
b8ba5faa7a ARM: 8631/1: clkdev: Detect errors in clk_hw_register_clkdev() for mass registration
commit 9388093db4 upstream.

Unlike clk_register_clkdev(), clk_hw_register_clkdev() doesn't check for
passed error objects from a previous registration call. Hence the caller
of clk_hw_register_*() has to check for errors before calling
clk_hw_register_clkdev*().

Make clk_hw_register_clkdev() more similar to clk_register_clkdev() by
adding this error check, removing the burden from callers that do mass
registration.

Fixes: e4f1b49bda ("clkdev: Add clk_hw based registration APIs")
Fixes: 944b9a41e0 ("clk: ls1x: Migrate to clk_hw based OF and registration APIs")
Fixes: 44ce9a9ae9 ("MIPS: TXx9: Convert to Common Clock Framework")
Fixes: f48d947a16 ("clk: clps711x: Migrate to clk_hw based OF and registration APIs")
Fixes: b4626a7f48 ("CLK: Add Loongson1C clock support")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-01-15 13:42:57 +01:00
Tony Lindgren
87dbf3dc16 ARM: OMAP4+: Fix bad fallthrough for cpuidle
commit cbf2642872 upstream.

We don't want to fall through to a bunch of errors for retention
if PM_OMAP4_CPU_OSWR_DISABLE is not configured for a SoC.

Fixes: 6099dd37c6 ("ARM: OMAP5 / DRA7: Enable CPU RET on suspend")
Acked-by: Santosh Shilimkar <ssantosh@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-01-15 13:42:57 +01:00
Tony Lindgren
b336dc57bc ARM: OMAP5: Fix build for PM code
commit da6d5993bf upstream.

It's CONFIG_SOC_OMAP5, not CONFIG_ARCH_OMAP5. Looks like make randconfig
builds have not hit this one yet.

Fixes: b3bf289c1c ("ARM: OMAP2+: Fix build with CONFIG_SMP and CONFIG_PM is not set")
Acked-by: Santosh Shilimkar <ssantosh@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-01-15 13:42:57 +01:00
Tony Lindgren
0f665deba9 ARM: OMAP5: Fix mpuss_early_init
commit 8a8be46afe upstream.

We need to properly initialize mpuss also on omap5 like we do on omap4.
Otherwise we run into similar kexec problems like we had on omap4 when
trying to kexec from a kernel with PM initialized.

Fixes: 0573b957fc ("ARM: OMAP4+: Prevent CPU1 related hang with kexec")
Acked-by: Santosh Shilimkar <ssantosh@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-01-15 13:42:57 +01:00
Thomas Gleixner
aa1c7b01c9 bus: arm-ccn: Prevent hotplug callback leak
commit 26242b3300 upstream.

In case the driver registration fails, the hotplug callback is leaked.

Not fatal, because it's never invoked as there are no instances registered,
but wrong nevertheless.

Fixes: fdc15a36d8 ("bus/arm-ccn: Convert to hotplug statemachine")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-01-15 13:42:57 +01:00
Chuck Lever
bd99e7a603 svcrdma: Clear xpt_bc_xps in xprt_setup_rdma_bc() error exit arm
commit 1b9f700b8c upstream.

Logic copied from xs_setup_bc_tcp().

Fixes: 39a9beab5a ('rpc: share one xps between all backchannels')
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-01-15 13:42:56 +01:00
Neil Armstrong
c2ce1c4133 ARM: qcom_defconfig: Fix MDM9515 LCC and GCC config
commit 206787737e upstream.

Correct prefix is MDM instead of MSM.

Fixes: 8aa788d3e5 ("ARM: configs: qualcomm: Add MDM9615 missing defconfigs")
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-01-15 13:42:56 +01:00
Kyle Roeschley
e925eb3426 ARM: zynq: Reserve correct amount of non-DMA RAM
commit 7a3cc2a7b2 upstream.

On Zynq, we haven't been reserving the correct amount of DMA-incapable
RAM to keep DMA away from it (per the Zynq TRM Section 4.1, it should be
the first 512k). In older kernels, this was masked by the
memblock_reserve call in arm_memblock_init(). Now, reserve the correct
amount excplicitly rather than relying on swapper_pg_dir, which is an
address and not a size anyway.

Fixes: 46f5b96 ("ARM: zynq: Reserve not DMAable space in front of the kernel")
Signed-off-by: Kyle Roeschley <kyle.roeschley@ni.com>
Tested-by: Nathan Rossi <nathan@nathanrossi.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-01-15 13:42:56 +01:00
Robert Jarzmik
78e2d9405e ARM: pxa: fix pxa25x interrupt init
commit e413bd33ac upstream.

In the device-tree case, the root interrupt controller cannot be
accessed through the 6th coprocessor, contrary to pxa27x and pxa3xx
architectures.

Fix it to behave as in non-devicetree builds.

Fixes: 32f17997c1 ("ARM: pxa: remove irq init from dt machines")
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-01-15 13:42:56 +01:00
Andreas Färber
596ff0afbe ARM64: dts: bcm2835: Fix bcm2837 compatible string
commit 4f24450c6e upstream.

bcm2837-rpi-3-b.dts, its only in-tree user, was overriding it as
"brcm,bcm2837" already.

Fixes: 9d56c22a78 ("ARM: bcm2835: Add devicetree for the Raspberry Pi 3.")
Cc: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-01-15 13:42:56 +01:00
Andrea Merello
e3937bc1cc ARM64: dts: bcm2837-rpi-3-b: remove incorrect pwr LED
commit a44e87b471 upstream.

We are incorrectly defining the pwr LED, attaching it to a gpio line
that is wired to the Wi-Fi SDIO module (which fails due to this).

The actual power LED is connected to the GPIO expander, which we don't
expose currently.

Fixes: 9d56c22a78 ("ARM: bcm2835: Add devicetree for the Raspberry Pi 3.")
Thanks-to: Eric Anholt <eric@anholt.net> [for clarifying we can't control the LED]
Signed-off-by: Andrea Merello <andrea.merello@gmail.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-01-15 13:42:56 +01:00
Matthias Brugger
d40152d5ac arm64: dts: mt8173: Fix auxadc node
commit a3207d644f upstream.

The devicetree node for mt8173-auxadc lacks the clock and
io-channel-cells property. This leads to a non-working driver.

	mt6577-auxadc 11001000.auxadc: failed to get auxadc clock
	mt6577-auxadc: probe of 11001000.auxadc failed with error -2

Fix these fields to get the device up and running.

Fixes: 748c7d4de4 ("ARM64: dts: mt8173: Add thermal/auxadc device
nodes")
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-01-15 13:42:56 +01:00
Mark Rutland
08aed6e888 tools/virtio: fix READ_ONCE()
commit 5da889c795 upstream.

The virtio tools implementation of READ_ONCE() has a single parameter called
'var', but erroneously refers to 'val' for its cast, and thus won't work unless
there's a variable of the correct type that happens to be called 'var'.

Fix this with s/var/val/, making READ_ONCE() work as expected regardless.

Fixes: a7c490333d ("tools/virtio: use virt_xxx barriers")
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: linux-kernel@vger.kernel.org
Cc: virtualization@lists.linux-foundation.org
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-01-15 13:42:56 +01:00
Larry Finger
e7d05ec192 powerpc: Fix build warning on 32-bit PPC
commit 8ae679c4bc upstream.

I am getting the following warning when I build kernel 4.9-git on my
PowerBook G4 with a 32-bit PPC processor:

    AS      arch/powerpc/kernel/misc_32.o
  arch/powerpc/kernel/misc_32.S:299:7: warning: "CONFIG_FSL_BOOKE" is not defined [-Wundef]

This problem is evident after commit 989cea5c14 ("kbuild: prevent
lib-ksyms.o rebuilds"); however, this change in kbuild only exposes an
error that has been in the code since 2005 when this source file was
created.  That was with commit 9994a33865 ("powerpc: Introduce
entry_{32,64}.S, misc_{32,64}.S, systbl.S").

The offending line does not make a lot of sense.  This error does not
seem to cause any errors in the executable, thus I am not recommending
that it be applied to any stable versions.

Thanks to Nicholas Piggin for suggesting this solution.

Fixes: 9994a33865 ("powerpc: Introduce entry_{32,64}.S, misc_{32,64}.S, systbl.S")
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-01-15 13:42:56 +01:00