Linux-ARM-Kernel Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [GIT PULL] late omap soc changes for v4.18 merge window
From: Olof Johansson @ 2018-05-25 22:25 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <pull-1527259829-686604@atomide.com>

On Fri, May 25, 2018 at 07:51:20AM -0700, Tony Lindgren wrote:
> From: "Tony Lindgren" <tony@atomide.com>
> 
> The following changes since commit 3bb3799cd4233b7c24622ae8c41455fb27a55c0f:
> 
>   Merge branch 'omap-for-v4.18/soc-fixes' into omap-for-v4.18/soc (2018-05-21 10:34:17 -0700)
> 
> are available in the Git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.18/soc-late-signed
> 
> for you to fetch changes up to 759c27bdc77577aaecb6f31768e5951a858f97a9:
> 
>   OMAP: CLK: CLKSRC: Add suspend resume hooks (2018-05-23 14:16:26 -0700)
> 
> ----------------------------------------------------------------
> Late omap soc changes for v4.18 merge window
> 
> This series contains two omap1 ams-delta GPIO clean-up patches to get
> started with removal of hard-coded GPIO numbers from drivers. And then
> the removal of board mach includes from drivers. The second patch mostly
> touches the ams-delta audio driver but is included here because of the
> removal of the latch gpios and is acked by Mark Brown.
> 
> And there are two more am437x related PM patches to save and restore
> control module and timer registers for RTC only suspend mode. Looks like
> the patch title for the timer changes is a bit misleading, not all the
> timer code is yet living under drivers/clocksource. But I had already
> pushed out the branch before I noticed this.

Merged, thanks!


-Olof

^ permalink raw reply

* [PATCH] arm64: dts: sprd: fix typo in 'remote-endpoint'
From: Olof Johansson @ 2018-05-25 22:11 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <CAAfSe-vCb7uXOV5GCg_EMEb6VC=oiofSggWHhWbEzpKWfODVZw@mail.gmail.com>

On Fri, May 25, 2018 at 10:36:45AM +0800, Chunyan Zhang wrote:
> Hi Arnd, Olof
> 
> Could you please take this patch through arm-soc git?

Applied.


-Olof

^ permalink raw reply

* [PATCH V2] PCI/portdrv: do not disable device on reboot/shutdown
From: Bjorn Helgaas @ 2018-05-25 22:10 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <984b9734-244d-04e9-946f-7524f148ff7c@codeaurora.org>

On Fri, May 25, 2018 at 09:30:59AM -0400, Sinan Kaya wrote:
> On 5/24/2018 2:35 PM, Bjorn Helgaas wrote:
> > That sounds like a reasonable idea, and it is definitely another can
> > of worms.  I looked briefly at some of the .shutdown() cases:
> 
> should we throw it into 4.18 and see what happens?

It wouldn't solve this particular problem because hpsa *does* have a
.shutdown() method.  The problem is that it doesn't work -- it's
supposed to stop DMA and interrupts but it apparently doesn't.

I think we need to fix hpsa first.

^ permalink raw reply

* [GIT PULL] Qualcomm Driver Fixes for 4.17-rc7
From: Olof Johansson @ 2018-05-25 22:01 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <1527220509-23245-1-git-send-email-andy.gross@linaro.org>

On Thu, May 24, 2018 at 10:55:09PM -0500, Andy Gross wrote:
> The following changes since commit 771c577c23bac90597c685971d7297ea00f99d11:
> 
>   Linux 4.17-rc6 (2018-05-20 15:31:38 -0700)

This is a newer -rc than I had for fixes, so I had to move forward. Feel
free to use as old an rc as you can on these branches too.

> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git tags/qcom-fixes-for-4.17-rc7
> 
> for you to fetch changes up to 5ec3444c8346c922316f4effafa8afc17defda0e:
> 
>   firmware: qcom: scm: Fix crash in qcom_scm_call_atomic1() (2018-05-24 22:36:45 -0500)


Merged, thanks!


-Olof

^ permalink raw reply

* [GIT PULL 2/2] arm64: dts: exynos: Second round for v4.18
From: Olof Johansson @ 2018-05-25 21:58 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <20180524182016.5866-2-krzk@kernel.org>

On Thu, May 24, 2018 at 08:20:16PM +0200, Krzysztof Kozlowski wrote:
> Hi,
> 
> On top of previous pull request.
> 
> Best regards,
> Krzysztof
> 
> 
> The following changes since commit 8dd6203f32f20cb83469eb859efded9e403b3e9f:
> 
>   arm64: dts: exynos: Add mem-2-mem Scaler devices (2018-05-13 11:26:13 +0200)
> 
> are available in the git repository at:
> 
>   https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt64-4.18-2
> 
> for you to fetch changes up to f0b5e8a21e6604980c35eeeba1ee3a124f45ad1f:
> 
>   arm64: dts: exynos: Add more clocks to Exynos5433 Decon/DeconTV (2018-05-23 20:23:24 +0200)


Merged, thanks!


-Olof

^ permalink raw reply

* [GIT PULL 1/2] ARM: dts: exynos: Second round for v4.18
From: Olof Johansson @ 2018-05-25 21:57 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <20180524182016.5866-1-krzk@kernel.org>

On Thu, May 24, 2018 at 08:20:15PM +0200, Krzysztof Kozlowski wrote:
> Hi,
> 
> On top of previous pull request.
> 
> Best regards,
> Krzysztof
> 
> 
> The following changes since commit 83cb529b2ef4f3446e60e75522d76fdaaea4724c:
> 
>   ARM: dts: exynos: Update x and y properties for mms114 touchscreen (2018-05-13 15:15:49 +0200)
> 
> are available in the git repository at:
> 
>   https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt-4.18-2
> 
> for you to fetch changes up to 68605101460ea4c62a966b1ad3e8db90d8fbaa31:
> 
>   ARM: dts: exynos: Add support for audio over HDMI for Odroid X/X2/U3 (2018-05-15 18:46:14 +0200)
> 
> ----------------------------------------------------------------
> Samsung DTS ARM changes for v4.18, part 2
> 
> 1. Add support for audio over HDMI for Odroid X/X2/U3.

Merged, thanks!


-Olof

^ permalink raw reply

* [GIT PULL] Rockchip driver updates for 4.18 round 2
From: Olof Johansson @ 2018-05-25 21:57 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <2574457.1saVLptjF6@phil>

On Thu, May 24, 2018 at 03:20:54PM +0200, Heiko Stuebner wrote:
> Hi Arnd, Kevin Olof,
> 
> please find below a second pull request for Rockchip-specific drivers,
> adding power-domain support for some more socs on top of the
> previous git tag.
> 
> 
> If it looks ok, please pull
> Heiko
> 
> The following changes since commit 9e59c5f66c624b43c766a9fe3b2430e0e976bf0e:
> 
>   soc: rockchip: power-domain: Fix wrong value when power up pd with writemask (2018-05-14 11:53:26 +0200)
> 
> are available in the Git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v4.18-rockchip-drivers-2
> 
> for you to fetch changes up to 9bdf401bf49eddba98ae36f7243b888d43496bd6:
> 
>   soc: rockchip: power-domain: add power domain support for px30 (2018-05-23 20:47:57 +0200)

Merged, thanks!


-Olof

^ permalink raw reply

* [GIT PULL] berlin dt changes for v4.18
From: Olof Johansson @ 2018-05-25 21:56 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <20180524160619.45aaead2@xhacker.debian>

On Thu, May 24, 2018 at 04:06:19PM +0800, Jisheng Zhang wrote:
> Hi,
> 
> Here is the pull request for berlin dt changes for v4.18.
> 
> Thanks,
> Jisheng
> 
> The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338:
> 
>   Linux 4.17-rc1 (2018-04-15 18:24:20 -0700)
> 
> are available in the Git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin.git tags/berlin-dt-for-v4.18
> 
> for you to fetch changes up to 15cf848d3c208159410eff2055494163c2542bbb:
> 
>   ARM: dts: berlin2q: move PMU node from soc to root (2018-05-24 15:25:44 +0800)
> 
> ----------------------------------------------------------------
> berlin DT changes for v4.18
> 
>  - add Valve Steam Link board support
>  - use PWM for chromecast's LED, override chromecast's bootloader
>    bad ATAG_MEM.
>  - fix twd timer irq type
>  - add interrupt-affinity to BG2Q's pmu
>  - add "cache-unified" to BG2Q's l2 node
>  - use SPDX-License-Identifier

Merged, thanks!


-Olof

^ permalink raw reply

* [GIT PULL] berlin dt64 changes for v4.18
From: Olof Johansson @ 2018-05-25 21:55 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <20180524160420.35da91b5@xhacker.debian>

On Thu, May 24, 2018 at 04:04:20PM +0800, Jisheng Zhang wrote:
> Hi,
> 
> Here is the pull request for berlin dt64 changes for v4.18.
> 
> Thanks,
> Jisheng
> 
> The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338:
> 
>   Linux 4.17-rc1 (2018-04-15 18:24:20 -0700)
> 
> are available in the Git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin.git tags/berlin64-dt-for-v4.18
> 
> for you to fetch changes up to 031106ce95a201f6dd4c5ebf35abb900cf34e2ba:
> 
>   arm64: dts: move berlin SoC files from marvell dir to synaptics dir (2018-05-24 13:25:45 +0800)
> 
> ----------------------------------------------------------------
> Berlin64 DT changes for v4.18
> 
>  - use SPDX-License-Identifier for dts(i) files
>  - move berlin SoC dts(i) files from marvell dir to synaptics dir

Usually we don't do renames, but this is a pure file move so it's not causing
significant disturbance, and there seems to be quite little overlap between
this and other marvell platforms on includes, etc, so it seems ok.


Merged, thanks!


-Olof

^ permalink raw reply

* [GIT PULL] berlin core changes for 4.18
From: Olof Johansson @ 2018-05-25 21:51 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <20180524155944.1de22147@xhacker.debian>

Hi,

On Thu, May 24, 2018 at 03:59:44PM +0800, Jisheng Zhang wrote:
> Hi
> 
> Here is our mach-berlin changes for v4.18.
> 
> Thanks,
> Jisheng
> 
> The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338:
> 
>   Linux 4.17-rc1 (2018-04-15 18:24:20 -0700)
> 
> are available in the Git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin.git tags/berlin-core-for-v4.18
> 
> for you to fetch changes up to eb14767c8a9117fdd84fc79e6263c85a4d8ec934:
> 
>   ARM: berlin: switch to SPDX license identifier (2018-05-24 14:49:09 +0800)
> 
> ----------------------------------------------------------------
> berlin core changes for v4.18
> 
> BG2CD SoC uses r3p0 Cortex-A9 MPCore single-CPU cluster. Autoselect
> pertinent errata, the SCU and the global timer, and allow use of the
> local timer on uniprocessor kernels.
> 
> remove non-necessary flush_cache_all() after scu_enable().
> 
> switch to SPDX license identifier for all files under mach-berlin/
> 
> ----------------------------------------------------------------
> Alexander Monakov (1):
>       ARM: berlin: extend BG2CD Kconfig entry
> 
> Jisheng Zhang (2):
>       arm: berlin: remove non-necessary flush_cache_all()
>       ARM: berlin: switch to SPDX license identifier

Merged, thanks!

Watch out for consistency on the patch subjects, please.

Also, you're cutting it a bit close w.r.t. merge window opening. If you can get
your pull requests in before -rc6 you run less risk of missing it if there's
a problem with it that needs a respin.




-Olof

^ permalink raw reply

* [GIT PULL] Amlogic 64-bit DT updates for v4.18, round 3
From: Olof Johansson @ 2018-05-25 21:49 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <7hmuwqqk8k.fsf@baylibre.com>

On Wed, May 23, 2018 at 11:50:51AM -0700, Kevin Hilman wrote:
> Olof, ARnd,
> 
> Here's final round of 64-bit DT updates for v4.18 for Amlogic.
> 
> I separated this one from round 2 because I've merged a tag from the
> clock tree where the headers were added that are used by the new clock
> driver nodes.
> 
> That clock dependency branch is already queued by the clock maintainers,
> but included here so the arm-soc DT branch will continue to build
> standalone.
> 
> Kevin
> 
> The following changes since commit ffe2f2a415a5c36c0629c0ac8ea3dda80fbfd4b6:
> 
>   ARM64: dts: meson-axg: enable i2c AO on the S400 board (2018-05-23 10:05:41 -0700)
> 
> are available in the git repository at:
> 
>   https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git tags/amlogic-dt64-3
> 
> for you to fetch changes up to 9adda3534faad306c3d5351c5b87d26fea9767be:
> 
>   ARM64: dts: meson: fix clock source of the pclk for UART_AO (2018-05-23 11:31:54 -0700)
> 
> ----------------------------------------------------------------
> Amlogic 64-bit DT updates, round3
> - AXG: add new clock driver

Merged, thanks!


-Olof

^ permalink raw reply

* [GIT PULL] Amlogic 64-bit DT updates for v4.18, round 2
From: Olof Johansson @ 2018-05-25 21:49 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <7hwovuqlrn.fsf@baylibre.com>

On Wed, May 23, 2018 at 11:17:48AM -0700, Kevin Hilman wrote:
> The following changes since commit c51fb2d458a6d62215c1ff6bbca8e5c876370e71:
> 
>   dt-bindings: arm: amlogic: add support for the Tronsmart MXIII Plus (2018-05-09 15:25:20 -0700)
> 
> are available in the git repository at:
> 
>   https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git tags/amlogic-dt64-2
> 
> for you to fetch changes up to ffe2f2a415a5c36c0629c0ac8ea3dda80fbfd4b6:
> 
>   ARM64: dts: meson-axg: enable i2c AO on the S400 board (2018-05-23 10:05:41 -0700)

Merged, thanks!


-Olof

^ permalink raw reply

* [GIT PULL] Amlogic 32-bit DT updates for v4.18, round 2
From: Olof Johansson @ 2018-05-25 21:48 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <7h1se2s0dd.fsf@baylibre.com>

On Wed, May 23, 2018 at 11:17:02AM -0700, Kevin Hilman wrote:
> The following changes since commit 35ee52bea66c74a7c33cebda8692d61b1ed7c6e9:
> 
>   ARM: dts: meson8m2: add support for the Tronsmart MXIII Plus (2018-05-10 17:03:28 -0700)
> 
> are available in the git repository at:
> 
>   https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git tags/amlogic-dt-2
> 
> for you to fetch changes up to ae0257da5701b6e44eba9dc4ebab867b56d6ea29:
> 
>   ARM: meson: merge Kconfig symbol MACH_MESON8B into MACH_MESON8 (2018-05-23 10:08:13 -0700)
> 
> ----------------------------------------------------------------
> Amlogic 32-bit DT changes for v4.18, round 2
> - remove MACH_MESON8B, only used for building DTs

Merged, thanks!


-Olof

^ permalink raw reply

* [GIT PULL 3/3] more omap dts changes for v4.18 merge window
From: Olof Johansson @ 2018-05-25 21:14 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <pull-1526925630-789198@atomide.com-3>

On Mon, May 21, 2018 at 12:41:32PM -0700, Tony Lindgren wrote:
> From: "Tony Lindgren" <tony@atomide.com>
> 
> The following changes since commit 8dfa75524a0e0e2b4eaf2a3dc178f6b4d8db85d9:
> 
>   ARM: dts: correct invalid I/O definition for MMC/SD card detect on T410 (2018-05-03 10:03:01 -0700)
> 
> are available in the Git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.18/dt-part2-signed
> 
> for you to fetch changes up to 0dbf99542caf8a767ea0ac286ca8077cc5e8bd32:
> 
>   ARM: dts: am3517-evm: Add User LEDs and Pushbutton (2018-05-18 14:07:38 -0700)
> 
> ----------------------------------------------------------------
> Second set of dts changes for omap variants for v4.18 merge window
> 
> This series of changes contains fixes for already queued tps65218
> IRQ_TYPE, and fixes for omap3 and am335x use of IRQ_TYPE. There are
> also addition of oscillator clock for logicpd omap3 boards and a series
> of changes to improve support for am3517-evm board. And there is also
> a change to configure WLAN for am437x-sk-evm.

Merged, thanks!


-Olof

^ permalink raw reply

* [GIT PULL 2/3] omap soc chages for v4.18 merge window
From: Olof Johansson @ 2018-05-25 21:13 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <pull-1526925630-789198@atomide.com-2>

On Mon, May 21, 2018 at 12:41:31PM -0700, Tony Lindgren wrote:
> From: "Tony Lindgren" <tony@atomide.com>
> 
> The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338:
> 
>   Linux 4.17-rc1 (2018-04-15 18:24:20 -0700)
> 
> are available in the Git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.18/soc-signed
> 
> for you to fetch changes up to 3bb3799cd4233b7c24622ae8c41455fb27a55c0f:
> 
>   Merge branch 'omap-for-v4.18/soc-fixes' into omap-for-v4.18/soc (2018-05-21 10:34:17 -0700)

Merged, thanks!


-Olof

^ permalink raw reply

* [GIT PULL 1/3] ti-sysc array access fix for v4.18 merge window
From: Olof Johansson @ 2018-05-25 21:12 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <pull-1526925630-789198@atomide.com>

On Mon, May 21, 2018 at 12:41:30PM -0700, Tony Lindgren wrote:
> From: "Tony Lindgren" <tony@atomide.com>
> 
> The following changes since commit dc4c85eac6bc8cfe25144936c5636aa1415bbc12:
> 
>   bus: ti-sysc: Show module information for suspend if DEBUG is enabled (2018-05-01 06:54:17 -0700)
> 
> are available in the Git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.18/ti-sysc-fix-signed
> 
> for you to fetch changes up to c97c8620833e4a55ddb7a43961d3205184a487f0:
> 
>   bus: ti-sysc: Fix optional clocks array access (2018-05-18 07:54:44 -0700)

Merged, thanks!


-Olof

^ permalink raw reply

* [PATCH 1/6] arm64: dts: amlogic: Add missing cooling device properties for CPUs
From: Olof Johansson @ 2018-05-25 21:10 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <2a2eb28da9fecf129f6bc0ab3d3748d9f4d25a29.1527225682.git.viresh.kumar@linaro.org>

On Fri, May 25, 2018 at 11:10:01AM +0530, Viresh Kumar wrote:
> The cooling device properties, like "#cooling-cells" and
> "dynamic-power-coefficient", should either be present for all the CPUs
> of a cluster or none. If these are present only for a subset of CPUs of
> a cluster then things will start falling apart as soon as the CPUs are
> brought online in a different order. For example, this will happen
> because the operating system looks for such properties in the CPU node
> it is trying to bring up, so that it can register a cooling device.
> 
> Add such missing properties.

This seems awkward compared to just having one cooling-cells in the /cpus node
instead.

What's it used for? I don't see any properties in the device nodes on meson-gxm
that have any cooling-foo cells in them? So why should #cooling-cells be
needed?


-Olof

^ permalink raw reply

* [PATCH] pwm: stm32: fix build warning with CONFIG_DMA_ENGINE disabled
From: Arnd Bergmann @ 2018-05-25 21:08 UTC (permalink / raw)
  To: linux-arm-kernel

Without dmaengine support, we get a harmless warning about an
unused function:

drivers/pwm/pwm-stm32.c:166:12: error: 'stm32_pwm_capture' defined but not used [-Werror=unused-function]

Changing the #ifdef to an IS_ENABLED() check shuts up that warning
and is slightly nicer to read.

Fixes: 53e38fe73f94 ("pwm: stm32: Add capture support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/pwm/pwm-stm32.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/pwm/pwm-stm32.c b/drivers/pwm/pwm-stm32.c
index 60bfc07c4912..97bbc1f18fd6 100644
--- a/drivers/pwm/pwm-stm32.c
+++ b/drivers/pwm/pwm-stm32.c
@@ -484,9 +484,7 @@ static int stm32_pwm_apply_locked(struct pwm_chip *chip, struct pwm_device *pwm,
 static const struct pwm_ops stm32pwm_ops = {
 	.owner = THIS_MODULE,
 	.apply = stm32_pwm_apply_locked,
-#if IS_ENABLED(CONFIG_DMA_ENGINE)
-	.capture = stm32_pwm_capture,
-#endif
+	.capture = IS_ENABLED(CONFIG_DMA_ENGINE) ? stm32_pwm_capture : NULL,
 };
 
 static int stm32_pwm_set_breakinput(struct stm32_pwm *priv,
-- 
2.9.0

^ permalink raw reply related

* [PATCH] mmc: sunxi: mark PM functions as __maybe_unused
From: Arnd Bergmann @ 2018-05-25 21:07 UTC (permalink / raw)
  To: linux-arm-kernel

The newly added runtime-pm functions cause a harmless warning
when CONFIG_PM is disabled:

drivers/mmc/host/sunxi-mmc.c:1452:12: error: 'sunxi_mmc_runtime_suspend' defined but not used [-Werror=unused-function]
 static int sunxi_mmc_runtime_suspend(struct device *dev)
            ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/mmc/host/sunxi-mmc.c:1435:12: error: 'sunxi_mmc_runtime_resume' defined but not used [-Werror=unused-function]
 static int sunxi_mmc_runtime_resume(struct device *dev)

This marks them as __maybe_unused to shut up the warning.

Fixes: 9a8e1e8cc2c0 ("mmc: sunxi: Add runtime_pm support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/mmc/host/sunxi-mmc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
index 97c6b79b7d6f..837888b96bd3 100644
--- a/drivers/mmc/host/sunxi-mmc.c
+++ b/drivers/mmc/host/sunxi-mmc.c
@@ -1432,7 +1432,7 @@ static int sunxi_mmc_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static int sunxi_mmc_runtime_resume(struct device *dev)
+static int __maybe_unused sunxi_mmc_runtime_resume(struct device *dev)
 {
 	struct mmc_host	*mmc = dev_get_drvdata(dev);
 	struct sunxi_mmc_host *host = mmc_priv(mmc);
@@ -1449,7 +1449,7 @@ static int sunxi_mmc_runtime_resume(struct device *dev)
 	return 0;
 }
 
-static int sunxi_mmc_runtime_suspend(struct device *dev)
+static int __maybe_unused sunxi_mmc_runtime_suspend(struct device *dev)
 {
 	struct mmc_host	*mmc = dev_get_drvdata(dev);
 	struct sunxi_mmc_host *host = mmc_priv(mmc);
-- 
2.9.0

^ permalink raw reply related

* [GIT PULL] Allwinner fixes for 4.17
From: Olof Johansson @ 2018-05-25 21:04 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <20180521115305.6ebm26zqx4a3rftv@flea>

On Mon, May 21, 2018 at 01:53:05PM +0200, Maxime Ripard wrote:
> Hi Arnd, Olof,
> 
> Here are our fixes for the 4.17 release.
> 
> Thanks!
> Maxime
> 
> The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338:
> 
>   Linux 4.17-rc1 (2018-04-15 18:24:20 -0700)
> 
> are available in the Git repository at:
> 
>   https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi-fixes-for-4.17
> 
> for you to fetch changes up to d89ad4f0b44dde8c5333ef7a5d5824829cc72de3:
> 
>   ARM: sun8i: v3s: fix spelling mistake: "disbaled" -> "disabled" (2018-05-02 14:10:58 +0200)
> 
> ----------------------------------------------------------------
> Allwinner fixes for 4.17
> 
> Here is a bunch of fixes for merge issues, typos and wrong clocks being
> described for simplefb, resulting in non-working displays.

Hi,

This late in the release cycle it'd be nice to have a bit more detail
on why each fix is critical before release, but they're small so I
merged anyway.


-Olof

^ permalink raw reply

* [GIT PULL] Allwinner arm64 changes for 4.18
From: Olof Johansson @ 2018-05-25 21:03 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <20180521114558.ozkb4ftf4p56ov7c@flea>

On Mon, May 21, 2018 at 01:45:58PM +0200, Maxime Ripard wrote:
> Hi Arnd, Olof,
> 
> Here is our bunch of arm64 DT changes for the next merge window.
> 
> Thanks!
> Maxime
> 
> The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338:
> 
>   Linux 4.17-rc1 (2018-04-15 18:24:20 -0700)
> 
> are available in the Git repository at:
> 
>   https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-dt64-for-4.18
> 
> for you to fetch changes up to 17ebc33afc35094f779ddca92ffcbda800365574:
> 
>   arm64: allwinner: h6: add PCF8563 RTC on Pine H64 board (2018-05-04 17:12:13 +0200)
> 
> ----------------------------------------------------------------
> Allwinner arm64 changes for 4.18
> 
> We mostly have some changes to support the H6, Allwinner latest SoC. We're
> still in the preliminary phase, with I2C, pinctrl and clock support.

Merged, thanks!


-Olof

^ permalink raw reply

* [GIT PULL] Allwinner core changes for 4.18
From: Olof Johansson @ 2018-05-25 21:02 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <20180521114156.6nppm5vomksxpeqv@flea>

On Mon, May 21, 2018 at 01:41:56PM +0200, Maxime Ripard wrote:
> Hi,
> 
> Here is our mach-sunxi changes for the next merge window, thanks!
> Maxime
> 
> The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338:
> 
>   Linux 4.17-rc1 (2018-04-15 18:24:20 -0700)
> 
> are available in the Git repository at:
> 
>   https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-core-for-4.18
> 
> for you to fetch changes up to 6961275e72a8c15cc4ebf108a81eee758480a6a2:
> 
>   ARM: sun8i: smp: Add support for A83T (2018-05-08 15:00:20 +0200)
> 
> ----------------------------------------------------------------
> Allwinner core changes for 4.18
> 
> The A83t, unlike the other Allwinner SoCs, cannot use PSCI because of a
> silicon bug. As such, we needed to have some smp_ops in order to bringup
> the various cores (and clusters) found on this SoC.

Hrm. that's unfortunate. Is there any public documentation of what the bug is?

(Merged).


-Olof

^ permalink raw reply

* [GIT PULL] Allwinner H3/H5 changes for 4.18
From: Olof Johansson @ 2018-05-25 20:59 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <20180521095517.liyqgj32d3xd7ejq@flea>

On Mon, May 21, 2018 at 11:55:17AM +0200, Maxime Ripard wrote:
> Hi Arnd, Olof,
> 
> Here is our usual PR with the changes that apply to the H3 and H5,
> shared between arm and arm64.
> 
> Maxime
> 
> The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338:
> 
>   Linux 4.17-rc1 (2018-04-15 18:24:20 -0700)
> 
> are available in the Git repository at:
> 
>   https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-h3-h5-for-4.18
> 
> for you to fetch changes up to 06139c822c5011ff79341000f44eca96151aac92:
> 
>   ARM: dts: sun8i: h3: Add SY8106A regulator to Orange Pi PC (2018-05-11 10:00:28 +0200)
> 
> ----------------------------------------------------------------
> Allwinner H3/H5 support for 4.18
> 
> Here is our usual bunch of changes for the H3 and H5 SoCs that share the
> same SoC design but with different CPUs.
> 
> This time, most of the changes are about supporting CPUFreq on these SoCs,
> with voltage scaling being enabled for a number of boards.

Merged, thanks!

-Olof

^ permalink raw reply

* [GIT PULL] Allwinner DT changes for 4.18
From: Olof Johansson @ 2018-05-25 20:58 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <20180521094839.j7aq43ljqw4k4mvw@flea>

On Mon, May 21, 2018 at 11:48:39AM +0200, Maxime Ripard wrote:
> Hi Arnd, Olof,
> 
> Here is our usual bunch of arm32 DT changes for the next release.
> 
> Thanks!
> Maxime
> 
> The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338:
> 
>   Linux 4.17-rc1 (2018-04-15 18:24:20 -0700)
> 
> are available in the Git repository at:
> 
>   https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-dt-for-4.18
> 
> for you to fetch changes up to 5d9ef839f874f4e3923c8a9ae7b136c6c3912cd5:
> 
>   ARM: dts: sun7i: Add Olimex A20-SOM-EVB-eMMC board (2018-05-21 11:41:03 +0200)
> 
> ----------------------------------------------------------------
> Allwinner DT additions for 4.18
> 
> Here is our usual bunch of DT changes for our arm SoCs, with most
> significantly:
>   - MIPI-DSI support for the A33
>   - NAND support for the A33
>   - SMP support for the A83t
>   - GMAC support for the R40
>   - And some new boards: Olimex A20-SOM-EVB-eMMC, Nintendo NES and SuperNES
>     Classic

Neat to see the Nintendo Classic systems support!

Merged, thanks!


-Olof

^ permalink raw reply

* [GIT PULL 5/5] i.MX defconfig updates for 4.18
From: Olof Johansson @ 2018-05-25 20:54 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <1526828281-14664-5-git-send-email-shawnguo@kernel.org>

On Sun, May 20, 2018 at 10:58:01PM +0800, Shawn Guo wrote:
> The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338:
> 
>   Linux 4.17-rc1 (2018-04-15 18:24:20 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git tags/imx-defconfig-4.18
> 
> for you to fetch changes up to 1049167999fc9a078c5914db9f341a275c2376cb:
> 
>   ARM: imx_v6_v7_defconfig: Select CONFIG_GPIO_MAX732X by default (2018-05-04 17:03:20 +0800)
> 
> ----------------------------------------------------------------
> i.MX defconfig update for 4.18:
>  - Enable i.MX6SLL SoC support.
>  - Build in GPIO_MAX732X support as the GPIO expanders are used on
>    i.MX6 SabreAuto boards.
>  - Enable driver for RN5T618 PMIC and Marvell MWIFIEX support which
>    are found on i.MX6/7 Colibri boards.
>  - Build in OCOTP NVMEM driver for Vybrid (vf610) SoCs.

Merged, thanks!


-Olof

^ permalink raw reply


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox