aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
AgeCommit message (Collapse)AuthorFilesLines
2021-06-24Merge branch 'for-next/perf' into for-next/coreWill Deacon1-2/+2
PMU driver cleanups for managing IRQ affinity and exposing event attributes via sysfs. * for-next/perf: (36 commits) drivers/perf: fix the missed ida_simple_remove() in ddr_perf_probe() perf/arm-cmn: Fix invalid pointer when access dtc object sharing the same IRQ number arm64: perf: Simplify EVENT ATTR macro in perf_event.c drivers/perf: Simplify EVENT ATTR macro in fsl_imx8_ddr_perf.c drivers/perf: Simplify EVENT ATTR macro in xgene_pmu.c drivers/perf: Simplify EVENT ATTR macro in qcom_l3_pmu.c drivers/perf: Simplify EVENT ATTR macro in qcom_l2_pmu.c drivers/perf: Simplify EVENT ATTR macro in SMMU PMU driver perf: Add EVENT_ATTR_ID to simplify event attributes perf/smmuv3: Don't trample existing events with global filter perf/hisi: Constify static attribute_group structs perf: qcom: Remove redundant dev_err call in qcom_l3_cache_pmu_probe() drivers/perf: hisi: Fix data source control arm64: perf: Add more support on caps under sysfs perf: qcom_l2_pmu: move to use request_irq by IRQF_NO_AUTOEN flag arm_pmu: move to use request_irq by IRQF_NO_AUTOEN flag perf: arm_spe: use DEVICE_ATTR_RO macro perf: xgene_pmu: use DEVICE_ATTR_RO macro perf: qcom: use DEVICE_ATTR_RO macro perf: arm_pmu: use DEVICE_ATTR_RO macro ...
2021-06-24ARM: dts: aspeed: Fix AST2600 machines line namesJoel Stanley2-8/+2
Tacoma and Rainier both have a line-names array that is too long: gpio gpiochip0: gpio-line-names is length 232 but should be at most length 208 This was probably copied from an AST2500 device tree that did have more GPIOs on the controller. Fixes: e9b24b55ca4f ("ARM: dts: aspeed: rainier: Add gpio line names") Fixes: 2f68e4e7df67 ("ARM: dts: aspeed: tacoma: Add gpio line names") Link: https://lore.kernel.org/r/20210624090742.56640-1-joel@jms.id.au Signed-off-by: Joel Stanley <joel@jms.id.au>
2021-06-23Merge tag 'v5.14-rockchip-dts32-2' of ↵Olof Johansson5-2/+67
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt Nodes for the Hantro-based video codecs on rk3036, rk3066, rk3188 and rk322x. * tag 'v5.14-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: add vpu and vdec node for RK322x ARM: dts: rockchip: add vpu nodes for RK3066 and RK3188 ARM: dts: rockchip: add vpu node for RK3036 Link: https://lore.kernel.org/r/4611716.rnzMqkiUVr@diego Signed-off-by: Olof Johansson <olof@lixom.net>
2021-06-23Merge tag 'v5.14-rockchip-dts32-1' of ↵Olof Johansson17-93/+295
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt A lot of fixes related to the dt-binding yaml conversion, power-domain additions for rk322x and rk3036 and the missing mmc aliases move to board files on rk3066/rk3188. * tag 'v5.14-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: add power controller for RK322x ARM: dts: rockchip: add power controller for RK3036 ARM: dts: rockchip: add labels to the timer nodes on rk3066a ARM: dts: rockchip: fix supply properties in io-domains nodes ARM: dts: rockchip: remove #phy-cells from usbphy node rk3066/rk3188 ARM: dts: rockchip: rename nodename for phy-rockchip-inno-usb2 ARM: dts: rockchip: move mmc aliases to board dts on rk3066/rk3188 ARM: dts: rockchip: move and restyle grf nodes rk3066/rk3188 ARM: dts: rockchip: rename vcc_stdby node name for rk3066a-rayeager.dts ARM: dts: rockchip: Remove more clock-names from PWM nodes ARM: dts: rockchip: add #power-domain-cells to power domain nodes ARM: dts: rockchip: Fix power-controller node names for rk3288 ARM: dts: rockchip: Fix power-controller node names for rk3188 ARM: dts: rockchip: Fix power-controller node names for rk3066a ARM: dts: rockchip: Remove useless interrupt-names on IOMMU node on rk3036 ARM: dts: rockchip: Fix IOMMU nodes properties on rk322x ARM: dts: rockchip: Fix the timer clocks order ARM: dts: rockchip: fix pinctrl sleep nodename for rk3036-kylin and rk3288 ARM: dts: rockchip: Fix thermal sensor cells o rk322x Link: https://lore.kernel.org/r/2084346.irdbgypaU6@phil Signed-off-by: Olof Johansson <olof@lixom.net>
2021-06-23Merge tag 'ixp4xx-arm-soc-v5.14' of ↵Olof Johansson13-146/+86
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into arm/soc This is a major chunk of IXP4xx modernization: - Fist we move some registers around to make room for the predetermined PCI I/O space. - Then we add some Kconfig options to make it possible to use the old PCI driver in parallell with the new shiny one. - Then we add the new PCI driver and some bindings for it. - On top of this we add an (ages old) patch from Arnd that centralize the CPU/SoC detection in drivers/soc and make the header a standard Linux header to avoid the <mach/*> business in drivers. - Then we split out and modernize some platform data headers for pata, and hwrandom, and top it up with DT bindings and support for hwrandom. * tag 'ixp4xx-arm-soc-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik: ixp4xx: fix spelling mistake in Kconfig "Devce" -> "Device" hw_random: ixp4xx: Add OF support hw_random: ixp4xx: Add DT bindings hw_random: ixp4xx: Turn into a module hw_random: ixp4xx: Use SPDX license tag hw_random: ixp4xx: enable compile-testing pata: ixp4xx: split platform data to its own header soc: ixp4xx: move cpu detection to linux/soc/ixp4xx/cpu.h PCI: ixp4xx: Add a new driver for IXP4xx PCI: ixp4xx: Add device tree bindings for IXP4xx ARM/ixp4xx: Make NEED_MACH_IO_H optional ARM/ixp4xx: Move the virtual IObases Link: https://lore.kernel.org/r/CACRpkdbw6HSpp7k6q1FYGmtafLmdAu8bFnpHQOdfBDYYsdLbkw@mail.gmail.com Signed-off-by: Olof Johansson <olof@lixom.net>
2021-06-23Merge tag 'omap-for-v5.14/dt-cleanup-signed' of ↵Olof Johansson14-86/+46
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt Devicetree binding clean-up for omaps for v5.14 Minor devicetree clean-up for omaps for the binding checks: - Drop unsupported dmas for omap2/3 i2c - Drop redundant ehrpwm compatible - Drop am33xx-ecap compatible no longer needed - Correct node names for ecap - Drop unsupported interrupts for ecap - Drop redundant ti,pcf8575 - Correct usage for ti,pindir-d0-out-d1-in * tag 'omap-for-v5.14/dt-cleanup-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: am437x: align ti,pindir-d0-out-d1-in property with dt-shema ARM: dts: am335x: align ti,pindir-d0-out-d1-in property with dt-shema ARM: dts: dra7x-evm: Drop "ti,pcf8575" ARM: dts: am33xx: Drop interrupt property from ecap nodes ARM: dts: ti: Fix node name for all ecap dt nodes ARM: dts: ti: Drop usage of ti,am33xx-ecap from DT nodes ARM: dts: ti: drop usage of redundant compatible ARM: dts: omap2/3: Drop dmas property from I2C node Link: https://lore.kernel.org/r/pull-1624002812-396117@atomide.com-2 Signed-off-by: Olof Johansson <olof@lixom.net>
2021-06-23Merge tag 'omap-for-v5.14/fixes-not-urgent-signed' of ↵Olof Johansson11-98/+101
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc Non-urgent fixes for omaps for v5.14 merge window Warn and block suspend for am335x unless the PM related modules and firmware are loaded and warn otherwise. Otherwise we easily end up with a suspended system with nothing capable of waking it up. We also drop a duplicated prototype for am33xx_init_early(). * tag 'omap-for-v5.14/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: Block suspend for am3 and am4 if PM is not configured ARM: OMAP2+: remove duplicated prototype ARM: dts: dra7: Fix duplicate USB4 target module node ARM: OMAP1: ams-delta: remove unused function ams_delta_camera_power bus: ti-sysc: Fix flakey idling of uarts and stop using swsup_sidle_act bus: ti-sysc: Fix am335x resume hang for usb otg module ARM: OMAP2+: Fix build warning when mmc_omap is not built ARM: OMAP1: isp1301-omap: Add missing gpiod_add_lookup_table function ARM: OMAP1: Fix use of possibly uninitialized irq variable bus: ti-sysc: Fix missing quirk flags for sata Link: https://lore.kernel.org/r/pull-1624002812-396117@atomide.com Signed-off-by: Olof Johansson <olof@lixom.net>
2021-06-23Merge tag 'omap-for-v5.13/fixes-rc6-signed' of ↵Olof Johansson5-78/+50
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes Fix duplicate usb4 regression for dra74 variants USB4 is only present in DRA74x variants, and I managed to add it for the other variants too with the recent legacy platform data removal. * tag 'omap-for-v5.13/fixes-rc6-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: dra7: Fix duplicate USB4 target module node Link: https://lore.kernel.org/r/pull-1623999845-180025@atomide.com Signed-off-by: Olof Johansson <olof@lixom.net>
2021-06-23Merge tag 'hisi-arm32-dt-for-5.14' of git://github.com/hisilicon/linux-hisi ↵Olof Johansson7-11/+11
into arm/dt ARM: DT: HiSilicon ARM32 DT updates for 5.14 - Correct the HiSilicon copyright * tag 'hisi-arm32-dt-for-5.14' of git://github.com/hisilicon/linux-hisi: ARM: dts: hisilicon: use the correct HiSilicon copyright Link: https://lore.kernel.org/r/60CBF408.7040302@hisilicon.com Signed-off-by: Olof Johansson <olof@lixom.net>
2021-06-22ARM: dts: rockchip: add vpu and vdec node for RK322xAlex Bee1-2/+25
The VPU and the VDEC IP block of RK322x are the same as RK3399 has and the drivers can be used as-is. Add the respective nodes to the device tree. Signed-off-by: Alex Bee <knaerzche@gmail.com> Link: https://lore.kernel.org/r/20210527154455.358869-13-knaerzche@gmail.com Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2021-06-22ARM: dts: rockchip: add vpu nodes for RK3066 and RK3188Alex Bee3-0/+21
Add the vpu node to the common rk3xxx.dtsi and only the powerdomain property to the SoC specific device trees. Signed-off-by: Alex Bee <knaerzche@gmail.com> Link: https://lore.kernel.org/r/20210527154455.358869-12-knaerzche@gmail.com Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2021-06-22ARM: dts: rockchip: add vpu node for RK3036Alex Bee1-0/+21
Add the vpu node and the node for the attached iommu for RK3036. Signed-off-by: Alex Bee <knaerzche@gmail.com> Link: https://lore.kernel.org/r/20210527154455.358869-11-knaerzche@gmail.com Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2021-06-21Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-armLinus Torvalds1-7/+9
Pull ARM fix from Russell King: - fix gcc 10 compiler regression with cpu_init() * tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm: ARM: 9081/1: fix gcc-10 thumb2-kernel regression
2021-06-21ARM: 9097/1: mmu: Declare section start/end correctlyLinus Walleij1-2/+2
The kernel test robot reported an interesting bug: A debug print was using %08x with kernel_sec_start and kernel_sec_end being phys_addr_t which can be either u32 or u64 (possibly more). Actually these should just be declared as u32 to begin with: they are declared as such in the assembly in head.S and the kernel definitely boots in a 32 bit physical address space. Redeclare the kernel_sec_start and kernel_sec_end to rid the bug. Reported-by: kernel test robot <lkp@intel.com> Fixes: 6e121df14ccd ("ARM: 9090/1: Map the lowmem and kernel separately") Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
2021-06-18sched: Introduce task_is_running()Peter Zijlstra1-1/+1
Replace a bunch of 'p->state == TASK_RUNNING' with a new helper: task_is_running(p). Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Davidlohr Bueso <dave@stgolabs.net> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Will Deacon <will@kernel.org> Link: https://lore.kernel.org/r/20210611082838.222401495@infradead.org
2021-06-18Merge branch 'sched/urgent' into sched/core, to resolve conflictsIngo Molnar11-25/+35
This commit in sched/urgent moved the cfs_rq_is_decayed() function: a7b359fc6a37: ("sched/fair: Correctly insert cfs_rq's to list on unthrottle") and this fresh commit in sched/core modified it in the old location: 9e077b52d86a: ("sched/pelt: Check that *_avg are null when *_sum are") Merge the two variants. Conflicts: kernel/sched/fair.c Signed-off-by: Ingo Molnar <mingo@kernel.org>
2021-06-17arm64: Add cpuidle context save/restore helpersMarc Zyngier1-0/+5
As we need to start doing some additional work on all idle paths, let's introduce a set of macros that will perform the work related to the GICv3 pseudo-NMI idle entry exit. Stubs are introduced to 32bit ARM for compatibility. As these helpers are currently unused, there is no functional change. Tested-by: Valentin Schneider <valentin.schneider@arm.com> Reviewed-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20210615111227.2454465-2-maz@kernel.org Signed-off-by: Will Deacon <will@kernel.org>
2021-06-17ixp4xx: fix spelling mistake in Kconfig "Devce" -> "Device"Colin Ian King1-1/+1
There is spelling mistake in the prompt text in the Kconfig. Fix it. Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2021-06-17hw_random: ixp4xx: Turn into a moduleLinus Walleij1-1/+23
Instead of just initializing always, which will invariably create problems on multiplatform builds, turn this driver into a module and pass a resource with the memory location. The device only exist on the IXP46x so we only register the device for the IXP46x SoC. Cc: Deepak Saxena <dsaxena@plexity.net> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2021-06-17pata: ixp4xx: split platform data to its own headerArnd Bergmann2-14/+1
Portable drivers cannot use mach/platform.h, so move the structure into its own header. With this, compile testing can be enabled. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2021-06-17soc: ixp4xx: move cpu detection to linux/soc/ixp4xx/cpu.hArnd Bergmann4-109/+23
Generic drivers are unable to use the feature macros from mach/cpu.h or the feature bits from mach/hardware.h, so move these into a global header file along with some dummy helpers that list these features as disabled elsewhere. Cc: David S. Miller <davem@davemloft.net> Cc: Jakub Kicinski <kuba@kernel.org> Cc: netdev@vger.kernel.org Cc: Zoltan HERPAI <wigyori@uid0.hu> Cc: Raylynn Knight <rayknight@me.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2021-06-17ARM: dts: hisilicon: use the correct HiSilicon copyrightHao Fang7-11/+11
s/Hisilicon/HiSilicon/. It should use capital S, according to the official website https://www.hisilicon.com/en. Signed-off-by: Hao Fang <fanghao11@huawei.com> Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
2021-06-16Merge tag 'amlogic-arm-dt-for-v5.14' of ↵Olof Johansson1-0/+1
https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/dt Amlogic ARM DT changes for v5.14: - Set the fifo-size of uart_A to 128 bytes like the ARM64 counterpart * tag 'amlogic-arm-dt-for-v5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux: ARM: dts: meson: Set the fifo-size of uart_A to 128 bytes Link: https://lore.kernel.org/r/2f19a5a1-3ed9-dd11-02f1-7d535cb1c25c@baylibre.com Signed-off-by: Olof Johansson <olof@lixom.net>
2021-06-16arm: zynq: don't disable CONFIG_ARM_GLOBAL_TIMER due to CONFIG_CPU_FREQ anymoreAndrea Merello1-1/+1
Now ARM global timer driver could work even if it's source clock rate changes, so we don't need to disable that driver when cpu frequency scaling is in use. This cause Zynq arch to get support for timer delay and get_cycles(). Signed-off-by: Andrea Merello <andrea.merello@gmail.com> Cc: Patrice Chotard <patrice.chotard@st.com> Cc: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: Michal Simek <michal.simek@xilinx.com> Cc: Sören Brinkmann <soren.brinkmann@xilinx.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Link: https://lore.kernel.org/r/20210406130045.15491-3-andrea.merello@gmail.com
2021-06-16ARM: disable CONFIG_IDE in pxa_defconfigChristoph Hellwig1-2/+0
pxa_defconfig already enables libata including the pata_pcmcia driver, so drop the legacy ide driver and idecs host driver. Signed-off-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20210616134658.1471835-5-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
2021-06-16ARM: disable CONFIG_IDE in footbridge_defconfigChristoph Hellwig1-1/+0
footbridge_defconfig enables CONFIG_IDE but no actual host controller driver, so just drop it. Signed-off-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20210616134658.1471835-4-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
2021-06-16ARM/ixp4xx: Make NEED_MACH_IO_H optionalLinus Walleij6-14/+26
In order to create a proper PCI driver for the IXP4xx we need to make the old PCI driver and its reliance on <mach/io.h> optional. Create a new Kconfig symbol for the legacy PCI driver IXP4XX_PCI_LEGACY and only activate NEED_MACH_IO_H for this driver. A few files need to be adjusted to explicitly include the <mach/hardware.h> and <mach/cpu.h> headers that they previously obtained implicitly using <linux/io.h> that would include <mach/io.h> and in turn include these two headers. This breaks our reliance on the old PCI and indirect PCI support so we can reimplement a proper purely DT-based driver in the PCI subsystem. Cc: Arnd Bergmann <arnd@arndb.de> Cc: Imre Kaloz <kaloz@openwrt.org> Cc: Krzysztof Halasa <khalasa@piap.pl> Cc: Zoltan HERPAI <wigyori@uid0.hu> Cc: Raylynn Knight <rayknight@me.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2021-06-16ARM/ixp4xx: Move the virtual IObasesLinus Walleij3-7/+12
UART1, UART2 and the expansion bus config registers are the only registers mapped in a fixed location when using device tree. For device tree we also want to get rid of the custom <mach/io.h> for IXP4xx. So we need to undefine CONFIG_NEED_MACH_IO_H. Doing that activates the fixed mapping of the PCI IO space to PCI_IO_VIRT_BASE which is hardcoded to 0xFEE00000 and this would collide with the old fixed mappings. Move the fixed virtual IO base address from 0xFEF00000 to 0xFEC00000 in order to avoid the collision. For the OF-only boot path let's even cut the reliance on <mach/io.h> and just hardcode the one single virtbase we need apart from the UART, which is hardcoded in Kconfig.debug. Cc: Arnd Bergmann <arnd@arndb.de> Cc: Imre Kaloz <kaloz@openwrt.org> Cc: Krzysztof Halasa <khalasa@piap.pl> Cc: Zoltan HERPAI <wigyori@uid0.hu> Cc: Raylynn Knight <rayknight@me.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2021-06-15Merge tag 'mstar-dt-5.14' of git://github.com/linux-chenxing/linux into arm/dtOlof Johansson1-0/+14
* tag 'mstar-dt-5.14' of git://github.com/linux-chenxing/linux: ARM: dts: mstar: Add watchdog device node Link: https://lore.kernel.org/r/CAFr9PXknSfSso6Uq0Fn_qJM5ZnJ4QK=YjJ32kKt4XYPrHK5x6w@mail.gmail.com Signed-off-by: Olof Johansson <olof@lixom.net>
2021-06-16ARM: dts: mstar: Add watchdog device nodeRomain Perier1-0/+14
This adds the definition of both an oscillator at 12Mhz required by the the watchdog and the watchdog device node. Signed-off-by: Romain Perier <romain.perier@gmail.com> Signed-off-by: Daniel Palmer <daniel@0x0f.com>
2021-06-15Merge tag 'tegra-for-5.14-arm-defconfig' of ↵Olof Johansson1-0/+1
git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/defconfig ARM: tegra: Default configuration changes for v5.14-rc1 Enables the devfreq thermal support to allow using the devfreq device as cooling device for the system. * tag 'tegra-for-5.14-arm-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: tegra_defconfig: Enable CONFIG_DEVFREQ_THERMAL Link: https://lore.kernel.org/r/20210611164437.3568059-5-thierry.reding@gmail.com Signed-off-by: Olof Johansson <olof@lixom.net>
2021-06-15Merge tag 'tegra-for-5.14-arm-dt' of ↵Olof Johansson15-31/+93
git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/dt ARM: tegra: Device tree changes for v5.14-rc1 This contains various improvements (such as microphone detection and thermal zones) for some older Tegra devices (such as the Nexus 7 or the Acer A500). * tag 'tegra-for-5.14-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: tegra: ouya: Enable memory frequency thermal throttling using ACTMON ARM: tegra: nexus7: Enable memory frequency thermal throttling using ACTMON ARM: tegra: Add cooling cells to ACTMON device-tree node ARM: tegra: nexus7: Correct 3v3 regulator GPIO of PM269 variant ARM: tegra: nexus7: Remove monitored-battery property ARM: tegra: nexus7: Improve thermal zones ARM: tegra: nexus7: Add i2c-thermtrip node ARM: tegra: paz00: Add CPU thermal zone ARM: tegra: wm8903: Fix polarity of headphones-detection GPIO in device-trees ARM: tegra: Add reg property to Tegra20 EMC table device-tree nodes ARM: tegra: acer-a500: Bump thermal trips by 10C ARM: tegra: acer-a500: Specify proper voltage for WiFi SDIO bus ARM: tegra: acer-a500: Improve microphone detection Link: https://lore.kernel.org/r/20210611164437.3568059-4-thierry.reding@gmail.com Signed-off-by: Olof Johansson <olof@lixom.net>
2021-06-15ARM: debug: add UART early console support for MSTAR SoCsRomain Perier1-0/+11
This adds the debug_ll uart for the PM UART found on armv7-based MStar SoCs. Signed-off-by: Romain Perier <romain.perier@gmail.com> Acked-by: Daniel Palmer <daniel@thingy.jp> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Tested-by: Mohammed Billoo <mohammed.billoo@gmail.com> Signed-off-by: Daniel Palmer <daniel@0x0f.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2021-06-15Merge tag 'qcom-dts-for-5.14' of ↵Olof Johansson2-0/+483
https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/dt Qualcomm DTS updates for v5.14 This adds DMA, NAND controllers, USB controller and PHY, RPM, L2CC, thermal sensors and defines thermal zones. It them enables these for the RB3011. * tag 'qcom-dts-for-5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: ARM: dts: qcom: Enable NAND + USB for RB3011 ARM: dts: qcom: add L2CC and RPM for IPQ8064 ARM: dts: qcom: Add USB port definitions to ipq806x ARM: dts: qcom: Add tsens details to ipq806x ARM: dts: qcom: Add ADM DMA + NAND definitions to ipq806x Link: https://lore.kernel.org/r/20210614223840.393224-1-bjorn.andersson@linaro.org Signed-off-by: Olof Johansson <olof@lixom.net>
2021-06-15Merge tag 'qcom-dts-fixes-for-5.13' of ↵Olof Johansson2-3/+3
https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes Qualcomm DTS fixes for v5.13 Failure to properly define "secure-regions" as 64-bit ranges prevents the two SDX55 boards from booting, so correct this. * tag 'qcom-dts-fixes-for-5.13' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: ARM: dts: qcom: sdx55-telit: Represent secure-regions as 64-bit elements ARM: dts: qcom: sdx55-t55: Represent secure-regions as 64-bit elements Link: https://lore.kernel.org/r/20210614215552.391887-1-bjorn.andersson@linaro.org Signed-off-by: Olof Johansson <olof@lixom.net>
2021-06-15Merge tag 'samsung-defconfig-5.14' of ↵Olof Johansson1-0/+1
https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/defconfig Samsung defconfig changes for v5.14 1. Enable Exynos Universal Flash Storage (UFS) driver for Exynos7 arm64 boards. 2. Restore framebuffer support in exynos_defconfig. * tag 'samsung-defconfig-5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: exynos_defconfig: restore framebuffer support arm64: defconfig: Enable Exynos UFS driver Link: https://lore.kernel.org/r/20210614193309.20248-3-krzysztof.kozlowski@canonical.com Signed-off-by: Olof Johansson <olof@lixom.net>
2021-06-15ARM: dts: ux500: Fix LED probingLinus Walleij1-0/+7
The Ux500 HREF LEDs have not been probing properly for a while as this was introduce: ret = of_property_read_u32(np, "color", &led_color); if (ret) return ret; Since the device tree did not define the new invented color attribute, probe was failing. Define color attributes for the LEDs so they work again. Link: https://lore.kernel.org/r/20210613123356.880933-1-linus.walleij@linaro.org Fixes: 92a81562e695 ("leds: lp55xx: Add multicolor framework support to lp55xx") Cc: stable@vger.kernel.org Cc: Dan Murphy <dmurphy@ti.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net>
2021-06-15Merge tag 'imx-defconfig-5.14' of ↵Olof Johansson1-0/+2
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/defconfig i.MX defconfig update for 5.14: - Enable LT8912B DRM bridge and Layerscape EDAC driver support in arm64 defconfig. - Enable WiFi ath10k SDIO driver in imx_v6_v7_defconfig. * tag 'imx-defconfig-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx_v6_v7_defconfig: Select the Wifi ath10k sdio driver arm64: defconfig: enable Layerscape EDAC driver arm64: defconfig: Enable LT8912B DRM bridge driver Link: https://lore.kernel.org/r/20210613082544.16067-6-shawnguo@kernel.org Signed-off-by: Olof Johansson <olof@lixom.net>
2021-06-15Merge tag 'imx-dt-5.14' of ↵Olof Johansson28-69/+2173
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt i.MX device tree changes for 5.14: - New board support: i.MX6Q DaSheng COM-9XX SBC board, i.MX28 based XEA board, GE B1x5v2 boards. - A series from Christoph Niedermaier to correct imx6q-dhcom descriptions, add device aliases and ethernet VIO regulator. - Correct Ethernet node name for imx51-digi-connectcore-som and imx53-ard board to comply DT schema. - A couple of update on imx6dl-yapp4 board, configuring OLED display segment offset, and using aliases to set custom MMC device indexes. - A series from Oleksij Rempel and Robin van der Gracht to update Protonic boards: imx6dl-prtvt7, imx6dl-plym2m and imx6qdl-vicut1. - A series from Shengjiu Wang to improve various audio support on NXP reference boards. - Rename pinfunc for i.MX25 GPIO_[A-F] pads for consistency. * tag 'imx-dt-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (30 commits) ARM: dts: imx6: Add GE B1x5v2 ARM: dts: imx6q-dhcom: Add ethernet VIO regulator ARM: dts: imx6q-dhcom: Add aliases for i2c, serial and rtc ARM: dts: imx6q-dhcom: Add gpios pinctrl for i2c bus recovery ARM: dts: imx6q-dhcom: Fix ethernet plugin detection problems ARM: dts: imx6q-dhcom: Fix ethernet reset time properties ARM: dts: imx6dl-prtvt7: Remove unused 'sound-dai-cells' from ssi1 node ARM: dts: imx6dl-prtvt7: The sgtl5000 uses i2s not ac97 ARM: dts: imx6qdl-vicut1: add interrupt-counter nodes ARM: dts: imx6dl-prtvt7: Enable the VPU ARM: dts: imx6dl: enable touchscreen debounce filter on PLYM2M and PRTVT7 boards ARM: dts: imx6dl-plym2m: remove touchscreen-size-* properties ARM: dts: imx6dl-prtvt7: fix PWM cell count for the backlight node. ARM: dts: imx6dl-prtvt7: Remove backlight enable gpio ARM: dts: imx6dl-prtvt7: add TSC2046 touchscreen node ARM: dts: imx53-ard: Correct Ethernet node name ARM: dts: i.MX51: digi-connectcore-som: Correct Ethernet node name ARM: dts: imx6dl-riotboard: configure PHY clock and set proper EEE value ARM: dts: imx6: edmqmx6: set phy-mode to RGMII-ID ARM: dts: imx6qdl-sabresd: Configure the gpio for hp detect ... Link: https://lore.kernel.org/r/20210613082544.16067-4-shawnguo@kernel.org Signed-off-by: Olof Johansson <olof@lixom.net>
2021-06-15Merge tag 'imx-soc-5.14' of ↵Olof Johansson11-149/+145
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/soc i.MX SoC changes for 5.14: - Add SMP support for i.MX7D, as there are i.MX7D devices running in field with U-Boot that doesn't support PSCI. - Fix imx5_cpu_suspend_info reference in i.MX5 PM code comments. - Add SoC ID initialization for i.MX50. - Drop unnecessary of_platform_default_populate() call from i.MX6Q .init_machine hook. - A series from Oleksij Rempel to remove most of the i.MX6/7 board specific PHY fixups. * tag 'imx-soc-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx: add smp support for imx7d ARM: imx6q: drop of_platform_default_populate() from init_machine ARM: imx7d: remove Atheros AR8031 PHY fixup ARM: imx6sx: remove Atheros AR8031 PHY fixup ARM: imx6q: remove Atheros AR8035 SmartEEE fixup ARM: imx6q: remove clk-out fixup for the Atheros AR8031 and AR8035 PHYs ARM: imx6q: remove BMCR_PDOWN handler in ar8035_phy_fixup() ARM: imx6q: remove part of ar8031_phy_fixup() ARM: imx6q: remove PHY fixup for KSZ9031 ARM: imx: Initialize SoC ID on i.MX50 ARM: imx: pm-imx5: Fix references to imx5_cpu_suspend_info Link: https://lore.kernel.org/r/20210613082544.16067-2-shawnguo@kernel.org Signed-off-by: Olof Johansson <olof@lixom.net>
2021-06-15Merge tag 'keystone_dts_for_5.13' of ↵Olof Johansson2-11/+6
git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into arm/dt ARM: DTS: Keystone K2G cleanup for v5.13 - Rename message manager node - Rename the TI-SCI node and clock - assign clock to McAsp * tag 'keystone_dts_for_5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: ARM: dts: keystone: k2g-evm: Move audio oscillator assigned clock to mcasp ARM: dts: keystone: k2g: Rename the TI-SCI clocks node name ARM: dts: keystone: k2g: Rename the TI-SCI node ARM: dts: keystone: k2g: Rename message-manager node Link: https://lore.kernel.org/r/1623564020-9958-1-git-send-email-santosh.shilimkar@oracle.com Signed-off-by: Olof Johansson <olof@lixom.net>
2021-06-14ARM: dts: meson: Set the fifo-size of uart_A to 128 bytesMartin Blumenstingl1-0/+1
The first UART controller in the "Everything-Else" power domain is called uart_A. Unlike all other UARTs (which use a 64 byte fifo-size in hardware) uart_A has a fifo-size of 128 bytes. This UART controller is typically used for Bluetooth HCI. The fifo-size of 128 bytes is valid from all SoCs from Meson6 (or possibly even earlier) all the way up to the latest 64-bit ones. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Acked-by: Neil Armstrong <narmstrong@baylibre.com> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Link: https://lore.kernel.org/r/20210604170844.2201229-1-martin.blumenstingl@googlemail.com
2021-06-14Merge tag 'v5.13-rc6' into usb-nextGreg Kroah-Hartman11-25/+35
We want the usb fixes in here as well, and this resolves some merge issues with: drivers/usb/dwc3/debugfs.c drivers/usb/dwc3/gadget.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-14Merge tag 'v5.13-rc6' into tty-nextGreg Kroah-Hartman11-25/+35
We want the tty fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-13ARM: 9096/1: Remove arm_pm_restart()Guenter Roeck2-6/+1
All users of arm_pm_restart() have been converted to use the kernel restart handler. Acked-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
2021-06-13ARM: 9094/1: Register with kernel restart handlerGuenter Roeck1-2/+18
By making use of the kernel restart handler, board specific restart handlers can be prioritized amongst available mechanisms for a particular board or system. Select the default priority of 128 to indicate that the restart callback in the machine description is the default restart mechanism. Acked-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
2021-06-13ARM: 9092/1: xen: Register with kernel restart handlerGuenter Roeck1-2/+10
Register with kernel restart handler instead of setting arm_pm_restart directly. Select a high priority of 192 to ensure that default restart handlers are replaced if Xen is running. Acked-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
2021-06-13ARM: 9091/1: Revert "mm: qsd8x50: Fix incorrect permission faults"Wang Kefeng2-28/+0
This reverts commit e220ba60223a9d63e70217e5b112160df8c21cea. The VERIFY_PERMISSION_FAULT is introduced since 2009 but no one use it, just revert it and clean unused comment. Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
2021-06-13ARM: 9090/1: Map the lowmem and kernel separatelyLinus Walleij1-33/+111
Using our knowledge of where the physical kernel sections start and end we can split mapping of lowmem and kernel apart. This is helpful when you want to place the kernel independently from lowmem and not be limited to putting it into lowmem only, but also into places such as the VMALLOC area. We extensively rewrite the lowmem mapping code to account for all cases where the kernel image overlaps with the lowmem in different ways. This is helpful to handle situations which occur when the kernel is loaded in different places and makes it possible to place the kernel in a more random manner which is done with e.g. KASLR. We sprinkle some comments with illustrations and pr_debug() over it so it is also very evident to readers what is happening. We now use the kernel_sec_start and kernel_sec_end instead of relying on __pa() (phys_to_virt) to provide this. This is helpful if we want to resolve physical-to-virtual and virtual-to-physical mappings at runtime rather than compiletime, especially if we are not using patch phys to virt. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
2021-06-13ARM: 9089/1: Define kernel physical section start and endLinus Walleij2-3/+31
When we are mapping the initial sections in head.S we know very well where the start and end of the kernel image in physical memory is placed. Later on it gets hard to determine this. Save the information into two variables named kernel_sec_start and kernel_sec_end for convenience for later work involving the physical start and end of the kernel. These variables are section-aligned corresponding to the early section mappings set up in head.S. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>