| Message ID | 20201023223122.19189-2-olof@lixom.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1f70935f637dfba226bf77182c2629fde61ed06e |
| Headers | show |
| Series | ARM: SoC contents for 5.10 | expand |
The pull request you sent on Fri, 23 Oct 2020 15:31:18 -0700:
> git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git tags/armsoc-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/1f70935f637dfba226bf77182c2629fde61ed06e
Thank you!
I had queued up a batch of fixes that got a bit close to the release for sending in before the merge window opened, so I'm including them in the batch of pull requests instead. They're mostly smaller DT tweaks and fixes, the usual mix that we tend to have through the releases. Conflicts: None ---------------------------------------------------------------- The following changes since commit f9893351acaecf0a414baf9942b48d5bb5c688c6: Merge tag 'kconfig-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git tags/armsoc-fixes for you to fetch changes up to 6869f774b1cd2bf20b4e4c5bfa13da311e02d495: Merge tag 'omap-for-v5.9/fixes-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes ---------------------------------------------------------------- Biju Das (1): ARM: dts: iwg20d-q7-common: Fix touch controller probe failure Dan Carpenter (1): soc: xilinx: Fix error code in zynqmp_pm_probe() Drew Fustini (1): ARM: dts: am33xx: modify AM33XX_IOPAD for #pinctrl-cells = 2 Jernej Skrabec (1): ARM: dts: sun8i: r40: bananapi-m2-ultra: Fix dcdc1 regulator Konrad Dybcio (2): arm64: dts: sdm630: Temporarily disable SMMUs by default arm64: dts: qcom: kitakami: Temporarily disable SDHCI1 Krzysztof Kozlowski (1): soc: actions: include header to fix missing prototype Olof Johansson (8): Merge tag 'ti-k3-dt-fixes-for-v5.9' of git://git.kernel.org/.../nmenon/linux into arm/fixes Merge tag 'sunxi-fixes-for-5.9-1' of https://git.kernel.org/.../sunxi/linux into arm/fixes Merge tag 'qcom-drivers-fixes-for-5.9' of https://git.kernel.org/.../qcom/linux into arm/fixes Merge tag 'qcom-arm64-fixes-for-5.9' of https://git.kernel.org/.../qcom/linux into arm/fixes Merge tag 'actions-drivers-fixes-for-v5.9' of git://git.kernel.org/.../mani/linux-actions into arm/fixes Merge tag 'zynqmp-soc-for-v5.9-v2' of https://github.com/Xilinx/linux-xlnx into arm/fixes Merge tag 'renesas-fixes-for-v5.9-tag1' of git://git.kernel.org/.../geert/renesas-devel into arm/fixes Merge tag 'omap-for-v5.9/fixes-rc7' of git://git.kernel.org/.../tmlind/linux-omap into arm/fixes Qiang Yu (1): arm64: dts: allwinner: h5: remove Mali GPU PMU module Rajendra Nayak (1): arm64: dts: sdm845: Fixup OPP table for all qup devices Roger Quadros (1): arm64: dts: ti: k3-j721e: Rename mux header and update macro names Sibi Sankar (1): soc: qcom: pdr: Fixup array type of get_domain_list_resp message Tony Lindgren (1): ARM: OMAP2+: Restore MPU power domain if cpu_cluster_pm_enter() fails Łukasz Patron (1): arm64: dts: qcom: pm660: Fix missing pound sign in interrupt-cells arch/arm/boot/dts/iwg20d-q7-common.dtsi | 15 ++++- .../boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 10 +-- arch/arm/mach-omap2/cpuidle44xx.c | 4 +- arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 6 +- .../dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 7 +- arch/arm64/boot/dts/qcom/pm660.dtsi | 2 +- arch/arm64/boot/dts/qcom/sdm630.dtsi | 8 +++ arch/arm64/boot/dts/qcom/sdm845.dtsi | 9 ++- .../boot/dts/ti/k3-j721e-common-proc-board.dts | 11 +-- arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 13 ++-- drivers/soc/actions/owl-sps-helper.c | 1 + drivers/soc/qcom/pdr_internal.h | 2 +- drivers/soc/xilinx/zynqmp_power.c | 2 +- include/dt-bindings/mux/mux-j721e-wiz.h | 53 --------------- include/dt-bindings/mux/ti-serdes.h | 71 ++++++++++++++++++++ include/dt-bindings/pinctrl/omap.h | 2 +- 16 files changed, 134 insertions(+), 82 deletions(-) delete mode 100644 include/dt-bindings/mux/mux-j721e-wiz.h create mode 100644 include/dt-bindings/mux/ti-serdes.h