* [GIT PULL 1/5] i.MX drivers updates for 4.16
From: Arnd Bergmann @ 2018-01-05 16:56 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1514959040-9992-1-git-send-email-shawnguo@kernel.org>
On Wed, Jan 3, 2018 at 6:57 AM, Shawn Guo <shawnguo@kernel.org> wrote:
> The following changes since commit 50c4c4e268a2d7a3e58ebb698ac74da0de40ae36:
>
> Linux 4.15-rc3 (2017-12-10 17:56:26 -0800)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git tags/imx-drivers-4.16
>
> for you to fetch changes up to cfabb7921ccbede2968e5049d433ba3d0e0950af:
>
> soc: imx: gpc: Add i.MX6SX PCI power domain (2017-12-26 16:26:46 +0800)
>
> ----------------------------------------------------------------
> i.MX drivers update for 4.16:
> - Update i.MX GPC driver to support PCI power domain of i.MX6SX SoC.
Pulled into next/drivers, thanks!
Arnd
^ permalink raw reply
* [GIT PULL 2/5] i.MX SoC updates for 4.16
From: Arnd Bergmann @ 2018-01-05 16:53 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1514959040-9992-2-git-send-email-shawnguo@kernel.org>
On Wed, Jan 3, 2018 at 6:57 AM, Shawn Guo <shawnguo@kernel.org> wrote:
> ----------------------------------------------------------------
> i.MX SoC updates for 4.16:
> - Drop power saving status checking from MMDC driver probe function,
> since there is nothing really depending on power saving being
> enabled.
> - Clean up unused imx3 pm definitions.
Pulled into next/soc, thanks!
Arnd
^ permalink raw reply
* [GIT PULL] Allwinner DT changes for 4.16, step 2
From: Arnd Bergmann @ 2018-01-05 16:51 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20180105102203.braqydzlkoy5tk3v@flea.lan>
On Fri, Jan 5, 2018 at 11:22 AM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> Hi Arnd, Olof,
>
> Happy new year :)
>
> Here is the second bunch of changes we talked about in our first PR.
>
> There's one fix for 4.16, and the other patches have been around for
> quite a while that I'm feeling confident that we should merge them.
Pulled into next/dt
> On a side note, my GPG key changed recently. The new fingerprint is
> 2BA0E943D27E3D2094B10B24D824ECA89C346DCE, and you'll find that it has
> been signed by a bunch of kernel developpers already. The old one is
> superseeded, but has not been compromised.
Ok.
Arnd
^ permalink raw reply
* [PATCH 3/7] ARM: dts: imx6ull: add additional pinfunc defines for i.MX 6ULL
From: Rob Herring @ 2018-01-05 16:49 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20180102164223.15230-3-stefan@agner.ch>
On Tue, Jan 02, 2018 at 05:42:19PM +0100, Stefan Agner wrote:
> From: Bai Ping <ping.bai@nxp.com>
>
> On i.MX 6ULL, the pin MUX and CTRL register of BOOT_MODEx and TAMPERx
> pins are available through IOMUXC_SNVS. Add additional pinfunc defines.
>
> Signed-off-by: Bai Ping <ping.bai@nxp.com>
> Signed-off-by: Stefan Agner <stefan@agner.ch>
> ---
> arch/arm/boot/dts/imx6ull-pinfunc-snvs.h | 29 +++++++++++++++++++++++++++++
> arch/arm/boot/dts/imx6ull.dtsi | 1 +
> 2 files changed, 30 insertions(+)
> create mode 100644 arch/arm/boot/dts/imx6ull-pinfunc-snvs.h
>
> diff --git a/arch/arm/boot/dts/imx6ull-pinfunc-snvs.h b/arch/arm/boot/dts/imx6ull-pinfunc-snvs.h
> new file mode 100644
> index 000000000000..da3f412e4269
> --- /dev/null
> +++ b/arch/arm/boot/dts/imx6ull-pinfunc-snvs.h
> @@ -0,0 +1,29 @@
> +/*
> + * Copyright (C) 2016 Freescale Semiconductor, Inc.
It's 2018 now.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
Use SPDX. With that,
Reviewed-by: Rob Herring <robh@kernel.org>
^ permalink raw reply
* [GIT PULL] ARM: mvebu: fixes for v4.15 (#1)
From: Arnd Bergmann @ 2018-01-05 16:47 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <87bmi89t53.fsf@free-electrons.com>
On Fri, Jan 5, 2018 at 5:18 PM, Gregory CLEMENT
<gregory.clement@free-electrons.com> wrote:
>>
>> git://git.infradead.org/linux-mvebu.git tags/mvebu-fixes-4.15-1
>>
>> for you to fetch changes up to fefb476bc7fdda4cb1e768493128c15a896f2c4e:
>>
>> ARM64: dts: marvell: armada-cp110: Fix clock resources for various node (2018-01-05 16:04:53 +0100)
>>
>
> Actually I fix the commit log of the patch "ARM64: dts: marvell:
> armada-cp110: Fix clock resources for various node" by replacing
> "logical" by "functional" which should make more sens. That means the
> the commit ID had changes and should be:
>
Pulled into fixes, thanks!
Arnd
^ permalink raw reply
* [RESEND PATCH] Wind down ARM/TANGO port
From: Arnd Bergmann @ 2018-01-05 16:46 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <3313974f-b241-1915-5c0c-22040e67dec0@sigmadesigns.com>
On Fri, Jan 5, 2018 at 12:24 PM, Marc Gonzalez
<marc_gonzalez@sigmadesigns.com> wrote:
> This is the end. Update port status. Change contact address. Add Mans.
>
> Signed-off-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
> ---
> Sigma is being sold. It is unlikely the STB unit will survive.
Applied to next/soc, thanks!
Arnd
^ permalink raw reply
* [PATCH 2/7] ARM: dts: imx6ul: update i.MX 6UltraLite iomux headers
From: Rob Herring @ 2018-01-05 16:45 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20180102164223.15230-2-stefan@agner.ch>
On Tue, Jan 02, 2018 at 05:42:18PM +0100, Stefan Agner wrote:
> From: Fugang Duan <fugang.duan@nxp.com>
>
> Update i.MX 6UltraLite IOMUXC pin defines.
That's obvious reading the diff. The commit message should tell me why.
They were wrong?
>
> Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
> Signed-off-by: Stefan Agner <stefan@agner.ch>
^ permalink raw reply
* [GIT PULL v2 2/2] TI DaVinci DT updates for v4.16
From: Arnd Bergmann @ 2018-01-05 16:45 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20180105145248.1994-2-nsekhar@ti.com>
On Fri, Jan 5, 2018 at 3:52 PM, Sekhar Nori <nsekhar@ti.com> wrote:
> ----------------------------------------------------------------
> A DT warning fix for W=1 warning message.
Pulled into fixes, thanks!
Arnd
^ permalink raw reply
* [PATCH] pinctrl: imx6ul: add IOMUXC SNVS pinctrl driver for i.MX 6ULL
From: Rob Herring @ 2018-01-05 16:42 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20180102164059.14641-1-stefan@agner.ch>
On Tue, Jan 02, 2018 at 05:40:59PM +0100, Stefan Agner wrote:
> From: Bai Ping <ping.bai@nxp.com>
>
> On i.MX 6ULL, the BOOT_MODEx and TAMPERx pin MUX and CTRL registers
> are available in a separate IOMUXC_SNVS module. Add support for the
> IOMUXC_SNVS module to the i.MX 6UL pinctrl driver.
>
> Signed-off-by: Bai Ping <ping.bai@nxp.com>
> Signed-off-by: Stefan Agner <stefan@agner.ch>
> ---
> .../bindings/pinctrl/fsl,imx6ul-pinctrl.txt | 3 +-
Reviewed-by: Rob Herring <robh@kernel.org>
> drivers/pinctrl/freescale/pinctrl-imx6ul.c | 52 +++++++++++++++++++++-
> 2 files changed, 52 insertions(+), 3 deletions(-)
^ permalink raw reply
* [PATCH -next] clk: meson-axg: fix potential NULL dereference in axg_clkc_probe()
From: Stephen Boyd @ 2018-01-05 16:24 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1515143370.7439.62.camel@baylibre.com>
On 01/05, Jerome Brunet wrote:
> On Fri, 2018-01-05 at 01:50 +0000, Wei Yongjun wrote:
> > platform_get_resource() may return NULL, add proper
> > check to avoid potential NULL dereferencing.
> >
> > This is detected by Coccinelle semantic patch.
> >
> > @@
> > expression pdev, res, n, t, e, e1, e2;
> > @@
> >
> > res = platform_get_resource(pdev, t, n);
> > + if (!res)
> > + return -EINVAL;
> > ... when != res == NULL
> > e = devm_ioremap(e1, res->start, e2);
> >
> > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
> > ---
>
> Looks good. Thank you.
>
> Stephen, do you prefer to take this directly ?
Yes. Will do today.
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply
* [GIT PULL] ARM: mvebu: dt64 for v4.16 (#2) (version 2)
From: Arnd Bergmann @ 2018-01-05 16:18 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <87k1ww9tgz.fsf@free-electrons.com>
On Fri, Jan 5, 2018 at 5:10 PM, Gregory CLEMENT
<gregory.clement@free-electrons.com> wrote:
> Hi,
>
> Here is the second pull request for dt64 for mvebu for v4.16 which
> replace the previous one.
>
> Indeed I had to push a fix which conflicted with the change done on the
> armada-cp110 files. Resolving the conflict was not automatic, so I chose
> to merge the mvebu/fixes branch in the mvebu/dt64 branch, as at the end
> during the merge window for 4.16 the content of mvebu/fixes would have
> been already merged in 4.15.
Pulled into next/dt, thanks!
Arnd
^ permalink raw reply
* [GIT PULL] ARM: mvebu: fixes for v4.15 (#1)
From: Gregory CLEMENT @ 2018-01-05 16:18 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <87lghc9urs.fsf@free-electrons.com>
Hi,
On ven., janv. 05 2018, Gregory CLEMENT <gregory.clement@free-electrons.com> wrote:
> Hi,
>
> Here is the first pull request for fixes for mvebu for v4.15.
>
> Gregory
>
> The following changes since commit 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323:
>
> Linux 4.15-rc1 (2017-11-26 16:01:47 -0800)
>
> are available in the Git repository at:
>
> git://git.infradead.org/linux-mvebu.git tags/mvebu-fixes-4.15-1
>
> for you to fetch changes up to fefb476bc7fdda4cb1e768493128c15a896f2c4e:
>
> ARM64: dts: marvell: armada-cp110: Fix clock resources for various node (2018-01-05 16:04:53 +0100)
>
Actually I fix the commit log of the patch "ARM64: dts: marvell:
armada-cp110: Fix clock resources for various node" by replacing
"logical" by "functional" which should make more sens. That means the
the commit ID had changes and should be:
e3af9f7c6ece29fdb7fe0aeb83ac5d3077a06edb:
ARM64: dts: marvell: armada-cp110: Fix clock resources for various node (2018-01-05 16:54:40 +0100)
Gregory
> ----------------------------------------------------------------
> mvebu fixess for 4.15 (part 1)
>
> 2 device tree related fixes fixing 2 issues:
> - broken pinctrl support since 4.11 on OpenBlocks A7
> - implicit clock dependency making the kernel hang if the Xenon sdhci
> module was loaded before the mvpp2 Ethernet support (for this one
> the driver had to be fixed which was done in v4.14)
>
> ----------------------------------------------------------------
> Gregory CLEMENT (1):
> ARM64: dts: marvell: armada-cp110: Fix clock resources for various node
>
> Thomas Petazzoni (1):
> ARM: dts: kirkwood: fix pin-muxing of MPP7 on OpenBlocks A7
>
> arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 10 ++++++++--
> arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 13 ++++++++-----
> arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 9 ++++++---
> 3 files changed, 22 insertions(+), 10 deletions(-)
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [GIT PULL] ARM: mvebu: dt64 for v4.16 (#2)
From: Arnd Bergmann @ 2018-01-05 16:14 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <87fu7k9tdn.fsf@free-electrons.com>
On Fri, Jan 5, 2018 at 5:12 PM, Gregory CLEMENT
<gregory.clement@free-electrons.com> wrote:
> Hi,
>
> On ven., janv. 05 2018, Gregory CLEMENT <gregory.clement@free-electrons.com> wrote:
>
>> Hi,
>>
>> Here is the second pull request for dt64 for mvebu for v4.16.
>
> Please do not pull this version but the second version I have just sent.
Good timing, I just started pulling it and pressed CTRL-C after seeing
you reply ;-)
Arnd
^ permalink raw reply
* [GIT PULL] ARM: mvebu: dt64 for v4.16 (#2)
From: Gregory CLEMENT @ 2018-01-05 16:12 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <878tdcbu69.fsf@free-electrons.com>
Hi,
On ven., janv. 05 2018, Gregory CLEMENT <gregory.clement@free-electrons.com> wrote:
> Hi,
>
> Here is the second pull request for dt64 for mvebu for v4.16.
Please do not pull this version but the second version I have just sent.
Thanks,
Gregory
>
> Gregory
>
> The following changes since commit 4cada03801992d09ccceaf5f462e9dadb75a9613:
>
> ARM64: dts: marvell: Add thermal support for A7K/A8K (2017-12-18 17:13:17 +0100)
>
> are available in the Git repository at:
>
> git://git.infradead.org/linux-mvebu.git tags/mvebu-dt64-4.16-2
>
> for you to fetch changes up to 38027b7d7c27c185a3e4e70f8d83509c3eda0daf:
>
> arm64: dts: marvell: add Ethernet aliases (2018-01-03 17:07:50 +0100)
>
> ----------------------------------------------------------------
> mvebu dt64 for 4.16 (part 2)
>
> The main change here are the series of commits doing the Armada 7K/8K
> CP110 DT de-duplication, they include the de-duplication itself and
> small fixes in the device tree files.
>
> Besides them there are 2 other patches:
> - One adding the crypto support for Armada 37xx SoCs
> - An other adding Ethernet aliases on A7K/A8K base boards
>
> ----------------------------------------------------------------
> Antoine Tenart (1):
> arm64: dts: marvell: armada-37xx: add a crypto node
>
> Thomas Petazzoni (8):
> arm64: dts: marvell: fix watchdog unit address in Armada AP806
> arm64: dts: marvell: use lower case for unit address and reg property
> arm64: dts: marvell: fix typos in comment describing the NAND controller
> arm64: dts: marvell: fix compatible string list for Armada CP110 slave NAND
> arm64: dts: marvell: use mvebu-icu.h where possible
> arm64: dts: marvell: use aliases for SPI busses on Armada 7K/8K
> arm64: dts: marvell: de-duplicate CP110 description
> arm64: dts: marvell: replace cpm by cp0, cps by cp1
>
> Yan Markman (1):
> arm64: dts: marvell: add Ethernet aliases
>
> arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 14 +
> arch/arm64/boot/dts/marvell/armada-7040-db.dts | 52 +--
> arch/arm64/boot/dts/marvell/armada-70x0.dtsi | 37 +-
> arch/arm64/boot/dts/marvell/armada-8020.dtsi | 2 +-
> arch/arm64/boot/dts/marvell/armada-8040-db.dts | 87 ++--
> arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 82 ++--
> arch/arm64/boot/dts/marvell/armada-8040.dtsi | 2 +-
> arch/arm64/boot/dts/marvell/armada-80x0.dtsi | 80 +++-
> arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 8 +-
> arch/arm64/boot/dts/marvell/armada-common.dtsi | 10 +
> .../boot/dts/marvell/armada-cp110-master.dtsi | 449 ---------------------
> .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 448 --------------------
> arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 422 +++++++++++++++++++
> 13 files changed, 668 insertions(+), 1025 deletions(-)
> create mode 100644 arch/arm64/boot/dts/marvell/armada-common.dtsi
> delete mode 100644 arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
> delete mode 100644 arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
> create mode 100644 arch/arm64/boot/dts/marvell/armada-cp110.dtsi
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [GIT PULL 4/5] Freescale arm64 device tree updates for 4.16
From: Arnd Bergmann @ 2018-01-05 16:12 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1514959040-9992-4-git-send-email-shawnguo@kernel.org>
On Wed, Jan 3, 2018 at 6:57 AM, Shawn Guo <shawnguo@kernel.org> wrote:
> The following changes since commit 50c4c4e268a2d7a3e58ebb698ac74da0de40ae36:
>
> Linux 4.15-rc3 (2017-12-10 17:56:26 -0800)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git tags/imx-dt64-4.16
>
> for you to fetch changes up to 1e33300782235ae6fdc891d9c3ba04ba59da6f3d:
>
> arm64: dts: ls208xa: add power monitor chip node (2017-12-26 17:14:13 +0800)
>
> ----------------------------------------------------------------
> Freescale arm64 device tree updates for 4.16:
> - LS1088A updates: add device support for DCFG, qoriq-mc, and USB.
> - Add power monitor device INA220 for ls208xa-rdb board.
Pulled into next/dt, thanks!
Arnd
^ permalink raw reply
* [PATCH v3 00/20] arm64: Unmap the kernel whilst running in userspace (KPTI)
From: Ard Biesheuvel @ 2018-01-05 16:12 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20180105160617.GC17349@kroah.com>
On 5 January 2018 at 16:06, Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
> On Thu, Jan 04, 2018 at 10:23:40AM -0800, Florian Fainelli wrote:
>> On 01/03/2018 10:50 PM, Greg Kroah-Hartman wrote:
>> > On Wed, Jan 03, 2018 at 09:17:26PM -0800, Florian Fainelli wrote:
>> >> On 12/11/2017 09:59 AM, Catalin Marinas wrote:
>> >>> On Wed, Dec 06, 2017 at 12:35:19PM +0000, Will Deacon wrote:
>> >>>> Patches are also pushed here:
>> >>>>
>> >>>> git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git kpti
>> >>>>
>> >>>> Feedback and testing welcome. At this point, I'd like to start thinking
>> >>>> about getting this merged for 4.16.
>> >>>
>> >>> For the record, the fixed up version was pushed by Will here:
>> >>>
>> >>> git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git kpti
>> >>>
>> >>> and I queued it for 4.16 in the arm64 for-next/core branch (same tree as
>> >>> above).
>> >>
>> >> Greg proposed the x86/KPTI patches for the stable-4.9.75 queue, is there
>> >> a plan to get the ARM64/KPTI patches backported towards stable trees as
>> >> well?
>> >
>> > Stable tree patches have to get into Linus's tree first before I can do
>> > anything :)
>> >
>> > Anyway, once that happens, yes, there is a plan, but it's a bit
>> > "different", and I'll talk about it once these are merged.
>>
>> Great, thanks! Bonus question, if someone is using any of the affected
>> devices in AArch32, should we be expecting to see ARM/Linux changes as
>> well, that is, is there a plan to come up with a kpti implementation for
>> ARM?
>
> I have not heard of anyone working on this for any arm32 platforms,
> as of this time, sorry.
>
> Which makes me worry about my android tv, glad I don't connect it to the
> network :(
>
The only ARM variant that is currently known to be affected by
Meltdown/variant 3 (which is what KPTI addresses) is the Cortex-A75,
which is a 64-bit core. That still means 32-bit guests running under
KVM will be affected, as well as a 32-bit kernel running on the bare
metal, but in practice, 32-bit ARM simply doesn't need KPTI. (My KASLR
patches for ARM are a bit in limbo atm, but those would benefit from
unmapping the kernel while running in userland as well)
As for variants 1/2 aka Spectre, I suppose ARM will need to implement
the same nospec/retpoline primitives that are being proposed for other
arches, but that work is not as fleshed out yet.
^ permalink raw reply
* [GIT PULL 3/5] i.MX device tree updates for 4.16
From: Arnd Bergmann @ 2018-01-05 16:11 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1514959040-9992-3-git-send-email-shawnguo@kernel.org>
On Wed, Jan 3, 2018 at 6:57 AM, Shawn Guo <shawnguo@kernel.org> wrote:
> The following changes since commit 50c4c4e268a2d7a3e58ebb698ac74da0de40ae36:
>
> Linux 4.15-rc3 (2017-12-10 17:56:26 -0800)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git tags/imx-dt-4.16
>
> for you to fetch changes up to 84a82ef70e1eb2a7a90bc19eed27cb27a8e4c54c:
>
> ARM: dts: imx7s: Avoid using label in unit address and reg (2017-12-27 10:52:39 +0800)
>
> ----------------------------------------------------------------
> i.MX device tree changes for 4.16:
> - A few random updates for vf610-zii board: correct switch EEPROM size,
> enable edma1, correct GPIO expander interrupt, add PHYs for switch2
> device.
> - LS1021A device tree updates: add reboot and QSPI device nodes, label
> USB controllers, specify interrupt-affinity for PMU, fix TMR_FIPER1
> setting, enable esdhc device, add Moxa UC-8410A board support.
> - A bunch of patches from Fabio: fix reg - unit address mismatches,
> remove leading zero in unit address, move regulators out of
> simple-bus, move nodes with no reg property out of bus, remove extra
> clock cell, add missing phy-cells to usb-nop-xceiv, etc.
> - A couple series from Hummingboard developers: re-organise device tree
> files for better handling various board versions, and then add the
> new hummingboard2 board support on top of that.
> - Disable AC'97 input pins pad and add support for powering off for
> imx6qdl-udoo board.
> - Convert from fbdev to drm bindings for imx6sx-sdb and imx6sl-evk
> board.
> - Add device tree for Variscite DART-MX6 SoM and Carrier-board support.
> - Add new board support of TS-4600 and TS-7970 from Technologic
> Systems.
> - A series from Stefan to update imx7-colibri device tree and then add
> new version of Toradex Colibri iMX7D board with eMMC support.
> - Other random updates on various board support.
Nice changelog, pulled into next/dt, thanks!
Arnd
^ permalink raw reply
* [linux-sunxi] [PATCH v2 3/6] ARM: sun4i: Convert to CCU
From: Kevin Hilman @ 2018-01-05 16:10 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <CAOi56cX0Uw=jiAhNSZ8p8_1LPbd7zePkS5kTnMf+ua0v98zfVg@mail.gmail.com>
On Wed, Dec 13, 2017 at 11:46 AM, Kevin Hilman <khilman@baylibre.com> wrote:
> On Wed, Dec 13, 2017 at 9:13 AM, Priit Laes <plaes@plaes.org> wrote:
>> On Wed, Dec 13, 2017 at 05:09:33PM +0000, Priit Laes wrote:
>>> On Tue, Dec 12, 2017 at 01:24:52PM -0800, Kevin Hilman wrote:
>>> > On Tue, Dec 12, 2017 at 9:26 AM, Priit Laes <plaes@plaes.org> wrote:
>>> > > On Mon, Dec 11, 2017 at 02:22:30PM -0800, Kevin Hilman wrote:
>>> > >> On Sun, Mar 26, 2017 at 10:20 AM, Priit Laes <plaes@plaes.org> wrote:
>>> > >> > Convert sun4i-a10.dtsi to new CCU driver.
>>> > >> >
>>> > >> > Signed-off-by: Priit Laes <plaes@plaes.org>
>>> > >>
>>> > >> I finally got around to bisecting a mainline boot failure on
>>> > >> sun4i-a10-cubieboard that's been happening for quite a while. Based
>>> > >> on on kernelci.org, it showed up sometime during the v4.15 merge
>>> > >> window[1]. It bisected down to this commit (in mainline as commit
>>> > >> 41193869f2bdb585ce09bfdd16d9482aadd560ad).
>>> > >>
>>> > >> When it fails, there is no output on the serial console, so I don't
>>> > >> know exactly how it's failing, just that it no longer boots.
>>> > >
>>> > > We tried out latest 4.15 with various compilers and it works:
>>> > > - gcc version 7.1.1 20170622 (Red Hat Cross 7.1.1-3) (GCC) - A10 Gemei G9 tablet
>>> > > - gcc 7.2.0-debian - A10 Cubieboard
>>> >
>>> > And you can reproduce the bug with gcc5 or gcc6?
>>>
>>> Tried following commits on Gemei G9 (A10 tablet):
>>> * 4.15.0-rc3-00037-gd39a01eff9af - latest master
>>> * 4.14.0-rc1-00002-g41193869f2bd - the exact commit, causing the issue.
>>>
>>> With the same Linaro toolchain:
>>> (gcc version 5.3.1 20160412 (Linaro GCC 5.3-2016.05))
>>
>> And I also tried the same dtb and zImage from kernelci page [1] and it works with
>> that too...
>>
>> https://storage.kernelci.org/mainline/master/v4.15-rc3/arm/sunxi_defconfig/
>
> Can you share a full boot-log (including all the u-boot output etc.)
> so I can see exactly how the kernel is being loaded? Especially the
> u-boot version?
>
> As $SUBJECT patch seems to be changing clocks around, perhaps this is
> an issue where some u-boot dependency is uncovered, and older versions
> of u-boot don't play well with this change.
Ping.
This is still failing in mainline, but passing int stable <= v4.14
Kevin
^ permalink raw reply
* [GIT PULL] ARM: mvebu: dt64 for v4.16 (#2) (version 2)
From: Gregory CLEMENT @ 2018-01-05 16:10 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
Here is the second pull request for dt64 for mvebu for v4.16 which
replace the previous one.
Indeed I had to push a fix which conflicted with the change done on the
armada-cp110 files. Resolving the conflict was not automatic, so I chose
to merge the mvebu/fixes branch in the mvebu/dt64 branch, as at the end
during the merge window for 4.16 the content of mvebu/fixes would have
been already merged in 4.15.
Gregory
The following changes since commit 4cada03801992d09ccceaf5f462e9dadb75a9613:
ARM64: dts: marvell: Add thermal support for A7K/A8K (2017-12-18 17:13:17 +0100)
are available in the Git repository at:
git://git.infradead.org/linux-mvebu.git tags/mvebu-dt64-4.16-2
for you to fetch changes up to 474c5885582c4a79c21bcf01ed98f98c935f1f4a:
arm64: dts: marvell: add Ethernet aliases (2018-01-05 17:02:45 +0100)
----------------------------------------------------------------
mvebu dt64 for 4.16 (part 2)
The main change here are the series of commits doing the Armada 7K/8K
CP110 DT de-duplication, they include the de-duplication itself and
small fixes in the device tree files.
Besides them there are 2 other patches:
- One adding the crypto support for Armada 37xx SoCs
- An other adding Ethernet aliases on A7K/A8K base boards
----------------------------------------------------------------
Antoine Tenart (1):
arm64: dts: marvell: armada-37xx: add a crypto node
Gregory CLEMENT (2):
ARM64: dts: marvell: armada-cp110: Fix clock resources for various node
Merge branch 'mvebu/fixes' into HEAD
Thomas Petazzoni (9):
ARM: dts: kirkwood: fix pin-muxing of MPP7 on OpenBlocks A7
arm64: dts: marvell: fix watchdog unit address in Armada AP806
arm64: dts: marvell: use lower case for unit address and reg property
arm64: dts: marvell: fix typos in comment describing the NAND controller
arm64: dts: marvell: fix compatible string list for Armada CP110 slave NAND
arm64: dts: marvell: use mvebu-icu.h where possible
arm64: dts: marvell: use aliases for SPI busses on Armada 7K/8K
arm64: dts: marvell: de-duplicate CP110 description
arm64: dts: marvell: replace cpm by cp0, cps by cp1
Yan Markman (1):
arm64: dts: marvell: add Ethernet aliases
arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 10 +-
arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 14 +
arch/arm64/boot/dts/marvell/armada-7040-db.dts | 52 +--
arch/arm64/boot/dts/marvell/armada-70x0.dtsi | 37 +-
arch/arm64/boot/dts/marvell/armada-8020.dtsi | 2 +-
arch/arm64/boot/dts/marvell/armada-8040-db.dts | 87 ++--
arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 82 ++--
arch/arm64/boot/dts/marvell/armada-8040.dtsi | 2 +-
arch/arm64/boot/dts/marvell/armada-80x0.dtsi | 80 +++-
arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 8 +-
arch/arm64/boot/dts/marvell/armada-common.dtsi | 10 +
.../boot/dts/marvell/armada-cp110-master.dtsi | 449 ---------------------
.../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 448 --------------------
arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 424 +++++++++++++++++++
14 files changed, 678 insertions(+), 1027 deletions(-)
create mode 100644 arch/arm64/boot/dts/marvell/armada-common.dtsi
delete mode 100644 arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
delete mode 100644 arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
create mode 100644 arch/arm64/boot/dts/marvell/armada-cp110.dtsi
^ permalink raw reply
* [GIT PULL] ARM: aspeed: dts changes for 4.16
From: Arnd Bergmann @ 2018-01-05 16:07 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <CACPK8XdOywvpyWqgOG6TVj4EwBqWA7yCmzaNqGQyvQJzPuseSg@mail.gmail.com>
On Wed, Jan 3, 2018 at 5:17 AM, Joel Stanley <joel@jms.id.au> wrote:
> ----------------------------------------------------------------
> ASPEED device tree updates for 4.16
>
> Clock driver support:
>
> Rework all platforms to use proper clock bindings. Linux should now boot
> upstream kernels on ast2400 and ast2500 platforms without out of tree
> patches.
>
> New systems:
>
> Witherspoon: OpenPower Power9 server manufactured by IBM that uses
> the ASPEED ast2500
> Zaius: OpenPower Power9 server manufactured by Invatech that uses the
> ASPEED ast2500
> Q71L: Intel Xeon server manufactured by Qanta that uses the ASPEED ast2400
>
> We also see updates to the Palmetto and Romulus systems to bring them in
> line with the functionality of those above.
>
> The systems take advantage of recently added drivers for LPC Snoop
> device and the PWM/Tachometer fan controller.
>
> OpenBMC flash layout:
>
> The flash layout used OpenBMC systems is added and the device trees now
> use it.
Pulled into next/dt, thanks!
Arnd
^ permalink raw reply
* [PATCH v3 00/20] arm64: Unmap the kernel whilst running in userspace (KPTI)
From: Greg Kroah-Hartman @ 2018-01-05 16:06 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <092a51ec-f856-2b51-5d47-8acbdc671031@gmail.com>
On Thu, Jan 04, 2018 at 10:23:40AM -0800, Florian Fainelli wrote:
> On 01/03/2018 10:50 PM, Greg Kroah-Hartman wrote:
> > On Wed, Jan 03, 2018 at 09:17:26PM -0800, Florian Fainelli wrote:
> >> On 12/11/2017 09:59 AM, Catalin Marinas wrote:
> >>> On Wed, Dec 06, 2017 at 12:35:19PM +0000, Will Deacon wrote:
> >>>> Patches are also pushed here:
> >>>>
> >>>> git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git kpti
> >>>>
> >>>> Feedback and testing welcome. At this point, I'd like to start thinking
> >>>> about getting this merged for 4.16.
> >>>
> >>> For the record, the fixed up version was pushed by Will here:
> >>>
> >>> git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git kpti
> >>>
> >>> and I queued it for 4.16 in the arm64 for-next/core branch (same tree as
> >>> above).
> >>
> >> Greg proposed the x86/KPTI patches for the stable-4.9.75 queue, is there
> >> a plan to get the ARM64/KPTI patches backported towards stable trees as
> >> well?
> >
> > Stable tree patches have to get into Linus's tree first before I can do
> > anything :)
> >
> > Anyway, once that happens, yes, there is a plan, but it's a bit
> > "different", and I'll talk about it once these are merged.
>
> Great, thanks! Bonus question, if someone is using any of the affected
> devices in AArch32, should we be expecting to see ARM/Linux changes as
> well, that is, is there a plan to come up with a kpti implementation for
> ARM?
I have not heard of anyone working on this for any arm32 platforms,
as of this time, sorry.
Which makes me worry about my android tv, glad I don't connect it to the
network :(
thanks,
greg k-h
^ permalink raw reply
* [PATCHv2] Device tree binding for Avago APDS990X light sensor
From: Rob Herring @ 2018-01-05 16:01 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20180102124450.GA18659@amd>
On Tue, Jan 02, 2018 at 01:44:51PM +0100, Pavel Machek wrote:
> From: Filip Matijevi? <filip.matijevic.pz@gmail.com>
>
> This prepares binding for light sensor used in Nokia N9.
"dt-bindings: ..." is the preferred subject prefix.
>
> Signed-off-by: Filip Matijevi? <filip.matijevic.pz@gmail.com>
> Signed-off-by: Pavel Machek <pavel@ucw.cz>
>
> diff --git a/Documentation/devicetree/bindings/misc/avago-apds990x.txt b/Documentation/devicetree/bindings/misc/avago-apds990x.txt
> new file mode 100644
> index 0000000..480c0b1
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/misc/avago-apds990x.txt
Put this with other light sensors whether you use IIO or not:
bindings/iio/light/
> @@ -0,0 +1,41 @@
> +Avago APDS990X driver
Bindings aren't drivers.
> +
> +https://docs.broadcom.com/docs/AV02-2867EN
> +
> +Required properties:
> +- compatible: "avago,apds990x"
> +- reg: address on the I2C bus
> +- interrupts: external interrupt line number
> +- vdd-supply: power supply for VDD
> +- vled-supply: power supply for LEDA
> +- avago,ga: Glass attenuation
We already have "upisemi,glass-coef". Can we align on something common.
> +- avago,cf1: Clear channel factor 1
> +- avago,irf1: IR channel factor 1
> +- avago,cf2: Clear channel factor 2
> +- avago,irf2: IR channel factor 2
Perhaps 2 properties with 2 cells for factor 1 and 2.
> +- avago,df: Device factor
Units/range for all these?
> +- avago,pdrive: IR current, one of APDS_IRLED_CURR_XXXmA values
Don't we have standard current property for LEDs?
> +- avago,ppcount: Proximity pulse count
Is this standard for prox sensors?
> +
> +Example (Nokia N9):
> +
> + als_ps at 39 {
light-sensor at 39
> + compatible = "avago,apds990x";
> + reg = <0x39>;
> +
> + interrupt-parent = <&gpio3>;
> + interrupts = <19 (IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_LEVEL_LOW)>; /* gpio_83 */
> +
> + vdd-supply = <&vaux1>;
> + vled-supply = <&vbat>;
> +
> + avago,ga = <168834>;
> + avago,cf1 = <4096>;
> + avago,irf1 = <7824>;
> + avago,cf2 = <877>;
> + avago,irf2 = <1575>;
> + avago,df = <52>;
> +
> + avago,pdrive = <0x2>; /* APDS_IRLED_CURR_25mA */
> + avago,ppcount = <5>;
> + };
>
> --
> (english) http://www.livejournal.com/~pavelmachek
> (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply
* [PATCH 10/12] clk: mediatek: switch to use dev_get_regmap() for MT7622 audsys
From: Rob Herring @ 2018-01-05 15:51 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <cbdada9cdbafda2452fe171a81588ce5b0d4f688.1514881870.git.ryder.lee@mediatek.com>
On Tue, Jan 02, 2018 at 07:47:52PM +0800, Ryder Lee wrote:
> As the new audsys wrapper driver is in place, switch to use dev_get_regmap()
> to obtain the regmap from its parent.
>
> This patch also add missing clock data 'CLK_AUDIO_AFE_CONN'.
"also" is a keyword for this belonging in a separate patch.
>
> Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
> ---
> drivers/clk/mediatek/clk-mt7622-aud.c | 11 +++++++++--
> include/dt-bindings/clock/mt7622-clk.h | 3 ++-
> 2 files changed, 11 insertions(+), 3 deletions(-)
^ permalink raw reply
* [PATCH 06/12] mfd: add DT bindings for MedaiTek audio subsystem
From: Rob Herring @ 2018-01-05 15:45 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <9ae24121a9cea18046428afd1d92c1b8601c0e05.1514881870.git.ryder.lee@mediatek.com>
On Tue, Jan 02, 2018 at 07:47:31PM +0800, Ryder Lee wrote:
> This patch adds documentation of the DT bindings for the MediaTek
> audio subsystem wrapper.
>
> Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
> ---
> .../devicetree/bindings/mfd/mtk-audsys.txt | 109 +++++++++++++++++++++
> 1 file changed, 109 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/mfd/mtk-audsys.txt
>
> diff --git a/Documentation/devicetree/bindings/mfd/mtk-audsys.txt b/Documentation/devicetree/bindings/mfd/mtk-audsys.txt
> new file mode 100644
> index 0000000..7739580
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/mfd/mtk-audsys.txt
> @@ -0,0 +1,109 @@
> +MediaTek Audio Subsystem Wrapper
> +
> +Required properties:
> +- compatible: Should be "mediatek,mt2701-audsys-core".
> +- reg: Should contain the device's region location and size.
The example shows 2 regions. What are they?
> +- clocks: Must contain an entry for each entry in clock-names.
> + See ../clocks/clock-bindings.txt for details.
> +- clock-names: Should contain "infra_aud", "top_a1sys", "top_a2sys".
> +
> +Required subnodes are described in:
> +- ../sound/mt2701-afe-pcm.txt.
> +- ../arm/mediatek/mediatek,audsys.txt.
> +
> +Example:
> +
> + audio-subsystm at 11220000 {
> + compatible = "mediatek,mt2701-audsys-core";
> + reg = <0 0x11220000 0 0x2000>,
> + <0 0x112a0000 0 0x20000>;
> + clocks = <&infracfg CLK_INFRA_AUDIO>,
> + <&topckgen CLK_TOP_AUD_48K_TIMING>,
> + <&topckgen CLK_TOP_AUD_44K_TIMING>;
> + clock-names = "infra_aud", "top_a1sys", "top_a2sys";
> +
> + audsys: clock {
> + compatible = "mediatek,mt2701-audsys";
> + #clock-cells = <1>;
There's no need for a node here. Just put #clock-cells in the parent.
> + };
> +
> + afe: audio {
> + compatible = "mediatek,mt2701-audio";
No registers associated with this?
Looks to me like you are creating nodes just to instantiate drivers.
Describe h/w blocks. DT is not the only way to instantiate drivers.
> + interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_LOW>,
> + <GIC_SPI 132 IRQ_TYPE_LEVEL_LOW>;
> + interrupt-names = "afe", "asys";
> + power-domains = <&scpsys MT2701_POWER_DOMAIN_IFR_MSC>;
> +
> + clocks = <&topckgen CLK_TOP_AUD_MUX1_SEL>,
> + <&topckgen CLK_TOP_AUD_MUX2_SEL>,
> + <&topckgen CLK_TOP_AUD_K1_SRC_SEL>,
> + <&topckgen CLK_TOP_AUD_K2_SRC_SEL>,
> + <&topckgen CLK_TOP_AUD_K3_SRC_SEL>,
> + <&topckgen CLK_TOP_AUD_K4_SRC_SEL>,
> + <&topckgen CLK_TOP_AUD_K1_SRC_DIV>,
> + <&topckgen CLK_TOP_AUD_K2_SRC_DIV>,
> + <&topckgen CLK_TOP_AUD_K3_SRC_DIV>,
> + <&topckgen CLK_TOP_AUD_K4_SRC_DIV>,
> + <&topckgen CLK_TOP_AUD_I2S1_MCLK>,
> + <&topckgen CLK_TOP_AUD_I2S2_MCLK>,
> + <&topckgen CLK_TOP_AUD_I2S3_MCLK>,
> + <&topckgen CLK_TOP_AUD_I2S4_MCLK>,
> + <&audsys CLK_AUD_I2SO1>,
> + <&audsys CLK_AUD_I2SO2>,
> + <&audsys CLK_AUD_I2SO3>,
> + <&audsys CLK_AUD_I2SO4>,
> + <&audsys CLK_AUD_I2SIN1>,
> + <&audsys CLK_AUD_I2SIN2>,
> + <&audsys CLK_AUD_I2SIN3>,
> + <&audsys CLK_AUD_I2SIN4>,
> + <&audsys CLK_AUD_ASRCO1>,
> + <&audsys CLK_AUD_ASRCO2>,
> + <&audsys CLK_AUD_ASRCO3>,
> + <&audsys CLK_AUD_ASRCO4>,
> + <&audsys CLK_AUD_AFE>,
> + <&audsys CLK_AUD_AFE_CONN>,
> + <&audsys CLK_AUD_A1SYS>,
> + <&audsys CLK_AUD_A2SYS>,
> + <&audsys CLK_AUD_AFE_MRGIF>;
> +
> + clock-names = "top_audio_mux1_sel",
> + "top_audio_mux2_sel",
> + "i2s0_src_sel",
> + "i2s1_src_sel",
> + "i2s2_src_sel",
> + "i2s3_src_sel",
> + "i2s0_src_div",
> + "i2s1_src_div",
> + "i2s2_src_div",
> + "i2s3_src_div",
> + "i2s0_mclk_en",
> + "i2s1_mclk_en",
> + "i2s2_mclk_en",
> + "i2s3_mclk_en",
> + "i2so0_hop_ck",
> + "i2so1_hop_ck",
> + "i2so2_hop_ck",
> + "i2so3_hop_ck",
> + "i2si0_hop_ck",
> + "i2si1_hop_ck",
> + "i2si2_hop_ck",
> + "i2si3_hop_ck",
> + "asrc0_out_ck",
> + "asrc1_out_ck",
> + "asrc2_out_ck",
> + "asrc3_out_ck",
> + "audio_afe_pd",
> + "audio_afe_conn_pd",
> + "audio_a1sys_pd",
> + "audio_a2sys_pd",
> + "audio_mrgif_pd";
> +
> + assigned-clocks = <&topckgen CLK_TOP_AUD_MUX1_SEL>,
> + <&topckgen CLK_TOP_AUD_MUX2_SEL>,
> + <&topckgen CLK_TOP_AUD_MUX1_DIV>,
> + <&topckgen CLK_TOP_AUD_MUX2_DIV>;
> + assigned-clock-parents = <&topckgen CLK_TOP_AUD1PLL_98M>,
> + <&topckgen CLK_TOP_AUD2PLL_90M>;
> + assigned-clock-rates = <0>, <0>, <49152000>, <45158400>;
> + };
> + };
> --
> 1.9.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe devicetree" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* [PATCH v3 1/6] media: rc: update sunxi-ir driver to get base clock frequency from devicetree
From: Sean Young @ 2018-01-05 15:43 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20171219080747.4507-2-embed3d@gmail.com>
On Tue, Dec 19, 2017 at 09:07:42AM +0100, Philipp Rossak wrote:
> This patch updates the sunxi-ir driver to set the base clock frequency from
> devicetree.
>
> This is necessary since there are different ir receivers on the
> market, that operate with different frequencies. So this value could be
> set if the attached ir receiver needs a different base clock frequency,
> than the default 8 MHz.
>
> Signed-off-by: Philipp Rossak <embed3d@gmail.com>
Acked-by: Sean Young <sean@mess.org>
Sean
> ---
> drivers/media/rc/sunxi-cir.c | 19 +++++++++++--------
> 1 file changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/media/rc/sunxi-cir.c b/drivers/media/rc/sunxi-cir.c
> index 97f367b446c4..f500cea228a9 100644
> --- a/drivers/media/rc/sunxi-cir.c
> +++ b/drivers/media/rc/sunxi-cir.c
> @@ -72,12 +72,8 @@
> /* CIR_REG register idle threshold */
> #define REG_CIR_ITHR(val) (((val) << 8) & (GENMASK(15, 8)))
>
> -/* Required frequency for IR0 or IR1 clock in CIR mode */
> +/* Required frequency for IR0 or IR1 clock in CIR mode (default) */
> #define SUNXI_IR_BASE_CLK 8000000
> -/* Frequency after IR internal divider */
> -#define SUNXI_IR_CLK (SUNXI_IR_BASE_CLK / 64)
> -/* Sample period in ns */
> -#define SUNXI_IR_SAMPLE (1000000000ul / SUNXI_IR_CLK)
> /* Noise threshold in samples */
> #define SUNXI_IR_RXNOISE 1
> /* Idle Threshold in samples */
> @@ -122,7 +118,8 @@ static irqreturn_t sunxi_ir_irq(int irqno, void *dev_id)
> /* for each bit in fifo */
> dt = readb(ir->base + SUNXI_IR_RXFIFO_REG);
> rawir.pulse = (dt & 0x80) != 0;
> - rawir.duration = ((dt & 0x7f) + 1) * SUNXI_IR_SAMPLE;
> + rawir.duration = ((dt & 0x7f) + 1) *
> + ir->rc->rx_resolution;
> ir_raw_event_store_with_filter(ir->rc, &rawir);
> }
> }
> @@ -148,6 +145,7 @@ static int sunxi_ir_probe(struct platform_device *pdev)
> struct device_node *dn = dev->of_node;
> struct resource *res;
> struct sunxi_ir *ir;
> + u32 b_clk_freq = SUNXI_IR_BASE_CLK;
>
> ir = devm_kzalloc(dev, sizeof(struct sunxi_ir), GFP_KERNEL);
> if (!ir)
> @@ -172,6 +170,9 @@ static int sunxi_ir_probe(struct platform_device *pdev)
> return PTR_ERR(ir->clk);
> }
>
> + /* Base clock frequency (optional) */
> + of_property_read_u32(dn, "clock-frequency", &b_clk_freq);
> +
> /* Reset (optional) */
> ir->rst = devm_reset_control_get_optional_exclusive(dev, NULL);
> if (IS_ERR(ir->rst))
> @@ -180,11 +181,12 @@ static int sunxi_ir_probe(struct platform_device *pdev)
> if (ret)
> return ret;
>
> - ret = clk_set_rate(ir->clk, SUNXI_IR_BASE_CLK);
> + ret = clk_set_rate(ir->clk, b_clk_freq);
> if (ret) {
> dev_err(dev, "set ir base clock failed!\n");
> goto exit_reset_assert;
> }
> + dev_dbg(dev, "set base clock frequency to %d Hz.\n", b_clk_freq);
>
> if (clk_prepare_enable(ir->apb_clk)) {
> dev_err(dev, "try to enable apb_ir_clk failed\n");
> @@ -225,7 +227,8 @@ static int sunxi_ir_probe(struct platform_device *pdev)
> ir->rc->map_name = ir->map_name ?: RC_MAP_EMPTY;
> ir->rc->dev.parent = dev;
> ir->rc->allowed_protocols = RC_PROTO_BIT_ALL_IR_DECODER;
> - ir->rc->rx_resolution = SUNXI_IR_SAMPLE;
> + /* Frequency after IR internal divider with sample period in ns */
> + ir->rc->rx_resolution = (1000000000ul / (b_clk_freq / 64));
> ir->rc->timeout = MS_TO_NS(SUNXI_IR_TIMEOUT);
> ir->rc->driver_name = SUNXI_IR_DEV;
>
> --
> 2.11.0
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox