Linux 5.10.53
Greg Kroah-Hartman
maintainerI'm announcing the release of the 5.10.53 kernel.
All users of the 5.10 kernel series must upgrade.
The updated 5.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.10.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 11 - arch/arm/boot/dts/am335x-baltos.dtsi | 4 arch/arm/boot/dts/am335x-evmsk.dts | 2 arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi | 2 arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi | 2 arch/arm/boot/dts/am33xx-l4.dtsi | 2 arch/arm/boot/dts/am437x-gp-evm.dts | 5 arch/arm/boot/dts/am437x-l4.dtsi | 2 arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 13 - arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 5 arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 6 arch/arm/boot/dts/bcm-cygnus.dtsi | 2 arch/arm/boot/dts/bcm-hr2.dtsi | 2 arch/arm/boot/dts/bcm-nsp.dtsi | 2 arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 4 arch/arm/boot/dts/bcm2711.dtsi | 2 arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 4 arch/arm/boot/dts/bcm2835-rpi-a.dts | 2 arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 4 arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 2 arch/arm/boot/dts/bcm2835-rpi-b.dts | 2 arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi | 2 arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 2 arch/arm/boot/dts/bcm2835-rpi-zero.dts | 2 arch/arm/boot/dts/bcm2835-rpi.dtsi | 2 arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 4 arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 4 arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 4 arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 2 arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 2 arch/arm/boot/dts/bcm283x.dtsi | 2 arch/arm/boot/dts/bcm63138.dtsi | 2 arch/arm/boot/dts/bcm7445-bcm97445svmb.dts | 4 arch/arm/boot/dts/bcm7445.dtsi | 2 arch/arm/boot/dts/bcm911360_entphn.dts | 4 arch/arm/boot/dts/bcm958300k.dts | 4 arch/arm/boot/dts/bcm958305k.dts | 4 arch/arm/boot/dts/bcm958522er.dts | 4 arch/arm/boot/dts/bcm958525er.dts | 4 arch/arm/boot/dts/bcm958525xmc.dts | 4 arch/arm/boot/dts/bcm958622hr.dts | 4 arch/arm/boot/dts/bcm958623hr.dts | 4 arch/arm/boot/dts/bcm958625hr.dts | 4 arch/arm/boot/dts/bcm958625k.dts | 4 arch/arm/boot/dts/bcm963138dvt.dts | 4 arch/arm/boot/dts/bcm988312hr.dts | 4 arch/arm/boot/dts/dm816x.dtsi | 2 arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi | 6 arch/arm/boot/dts/dra7-l4.dtsi | 4 arch/arm/boot/dts/dra72x.dtsi | 6 arch/arm/boot/dts/dra74-ipu-dsp-common.dtsi | 2 arch/arm/boot/dts/dra74x.dtsi | 8 arch/arm/boot/dts/gemini-dlink-dns-313.dts | 2 arch/arm/boot/dts/gemini-nas4220b.dts | 2 arch/arm/boot/dts/gemini-rut1xx.dts | 2 arch/arm/boot/dts/gemini-wbd111.dts | 2 arch/arm/boot/dts/gemini-wbd222.dts | 2 arch/arm/boot/dts/gemini.dtsi | 1 arch/arm/boot/dts/imx6dl-riotboard.dts | 2 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 5 arch/arm/boot/dts/omap4-l4.dtsi | 4 arch/arm/boot/dts/omap5-l4.dtsi | 4 arch/arm/boot/dts/rk3036-kylin.dts | 2 arch/arm/boot/dts/rk3066a.dtsi | 6 arch/arm/boot/dts/rk3188.dtsi | 14 - arch/arm/boot/dts/rk322x.dtsi | 12 - arch/arm/boot/dts/rk3288-rock2-som.dtsi | 2 arch/arm/boot/dts/rk3288-vyasa.dts | 4 arch/arm/boot/dts/rk3288.dtsi | 14 - arch/arm/boot/dts/ste-ab8500.dtsi | 28 +-- arch/arm/boot/dts/ste-ab8505.dtsi | 24 +- arch/arm/boot/dts/ste-href-ab8500.dtsi | 2 arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi | 3 arch/arm/boot/dts/ste-href.dtsi | 2 arch/arm/boot/dts/ste-snowball.dts | 2 arch/arm/boot/dts/stm32429i-eval.dts | 8 arch/arm/boot/dts/stm32746g-eval.dts | 6 arch/arm/boot/dts/stm32f429-disco.dts | 6 arch/arm/boot/dts/stm32f429.dtsi | 10 - arch/arm/boot/dts/stm32f469-disco.dts | 6 arch/arm/boot/dts/stm32f746.dtsi | 12 - arch/arm/boot/dts/stm32f769-disco.dts | 6 arch/arm/boot/dts/stm32h743.dtsi | 4 arch/arm/boot/dts/stm32mp151.dtsi | 12 - arch/arm/boot/dts/stm32mp157a-stinger96.dtsi | 7 arch/arm/boot/dts/stm32mp157c-odyssey-som.dtsi | 7 arch/arm/boot/dts/stm32mp157c-odyssey.dts | 2 arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi | 7 arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 7 arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 2 arch/arm/boot/dts/stm32mp15xx-osd32.dtsi | 7 arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 2 arch/arm/boot/dts/tegra20-harmony.dts | 2 arch/arm/boot/dts/tegra20-medcom-wide.dts | 2 arch/arm/boot/dts/tegra20-plutux.dts | 2 arch/arm/boot/dts/tegra20-seaboard.dts | 2 arch/arm/boot/dts/tegra20-tec.dts | 2 arch/arm/boot/dts/tegra20-ventana.dts | 2 arch/arm/boot/dts/tegra30-asus-nexus7-grouper-ti-pmic.dtsi | 2 arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 arch/arm/mach-imx/suspend-imx53.S | 4 arch/arm/mach-omap2/pm33xx-core.c | 40 ++++ arch/arm64/boot/dts/arm/juno-base.dtsi | 6 arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 1 arch/arm64/boot/dts/freescale/imx8mq.dtsi | 16 + arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 6 arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 8 arch/arm64/boot/dts/marvell/cn9130-db.dts | 2 arch/arm64/boot/dts/qcom/sc7180-idp.dts | 2 arch/arm64/boot/dts/rockchip/px30.dtsi | 16 - arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 4 arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 4 arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 4 arch/arm64/boot/dts/rockchip/rk3328.dtsi | 6 arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 2 arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 4 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 42 ++--- arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 2 arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts | 2 arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts | 2 arch/ia64/include/asm/pgtable.h | 5 arch/ia64/mm/init.c | 6 arch/s390/include/asm/stacktrace.h | 97 +++++++++++ arch/s390/kernel/traps.c | 2 arch/x86/events/intel/uncore_snbep.c | 6 arch/x86/net/bpf_jit_comp.c | 3 drivers/dma-buf/sync_file.c | 13 - drivers/firmware/Kconfig | 2 drivers/firmware/arm_scmi/common.h | 2 drivers/firmware/arm_scmi/driver.c | 2 drivers/firmware/tegra/Makefile | 1 drivers/firmware/tegra/bpmp-private.h | 3 drivers/firmware/tegra/bpmp.c | 3 drivers/firmware/turris-mox-rwtm.c | 1 drivers/gpu/drm/panel/panel-novatek-nt35510.c | 4 drivers/memory/tegra/tegra124-emc.c | 4 drivers/memory/tegra/tegra30-emc.c | 4 drivers/net/dsa/mv88e6xxx/chip.c | 12 + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 23 -- drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 6 drivers/net/ethernet/moxa/moxart_ether.c | 4 drivers/net/ethernet/qualcomm/emac/emac.c | 3 drivers/net/ethernet/ti/tlan.c | 3 drivers/net/fddi/defza.c | 3 drivers/net/netdevsim/ipsec.c | 8 drivers/net/vmxnet3/vmxnet3_ethtool.c | 22 ++ drivers/reset/reset-ti-syscon.c | 4 drivers/rtc/rtc-max77686.c | 4 drivers/rtc/rtc-mxc_v2.c | 1 drivers/scsi/aic7xxx/aic7xxx_core.c | 2 drivers/scsi/aic94xx/aic94xx_init.c | 1 drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 1 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 1 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 1 drivers/scsi/isci/init.c | 1 drivers/scsi/libfc/fc_rport.c | 13 - drivers/scsi/libsas/sas_scsi_host.c | 9 + drivers/scsi/mvsas/mv_init.c | 1 drivers/scsi/pm8001/pm8001_init.c | 1 drivers/scsi/qedf/qedf_io.c | 22 ++ drivers/soc/tegra/fuse/fuse-tegra30.c | 3 drivers/thermal/imx_sc_thermal.c | 3 drivers/thermal/rcar_gen3_thermal.c | 5 drivers/thermal/sprd_thermal.c | 15 + drivers/thermal/thermal_core.c | 2 drivers/thermal/thermal_of.c | 3 drivers/usb/cdns3/gadget.c | 8 fs/cifs/cifs_dfs_ref.c | 3 fs/f2fs/sysfs.c | 4 include/linux/bpf.h | 1 include/linux/huge_mm.h | 2 include/linux/swap.h | 9 - include/linux/swapops.h | 2 include/net/dst_metadata.h | 4 include/net/ip6_route.h | 2 include/net/tcp.h | 4 kernel/bpf/core.c | 8 kernel/bpf/verifier.c | 60 ++----- kernel/sched/fair.c | 4 mm/huge_memory.c | 36 ++-- mm/memory.c | 36 +--- mm/page_alloc.c | 106 ++++++++----- mm/shmem.c | 14 - net/bridge/br_if.c | 17 +- net/dsa/switch.c | 4 net/ipv4/ip_tunnel.c | 18 +- net/ipv4/tcp.c | 3 net/ipv4/tcp_input.c | 2 net/ipv4/tcp_ipv4.c | 4 net/ipv4/tcp_output.c | 1 net/ipv4/udp.c | 6 net/ipv6/tcp_ipv6.c | 21 ++ net/ipv6/udp.c | 2 net/ipv6/xfrm6_output.c | 2 net/netfilter/nf_conntrack_netlink.c | 3 net/sched/act_ct.c | 14 + scripts/Kbuild.include | 7 scripts/mkcompile_h | 14 + tools/bpf/Makefile | 7 tools/bpf/bpftool/jit_disasm.c | 6 tools/perf/tests/bpf.c | 2 201 files changed, 834 insertions(+), 568 deletions(-)
Alexander Ovechkin (1):
net: send SYNACK packet with accepted fwmark
Alexandre Torgue (6):
ARM: dts: stm32: fix gpio-keys node on STM32 MCU boards
ARM: dts: stm32: fix RCC node name on stm32f429 MCU
ARM: dts: stm32: fix timer nodes on STM32 MCU to prevent warnings
ARM: dts: stm32: fix i2c node name on stm32f746 to prevent warnings
ARM: dts: stm32: move stmmac axi config in ethernet node on stm32mp15
ARM: dts: stm32: fix stpmic node for stm32mp1 boards
Andrew Jeffery (1):
ARM: dts: tacoma: Add phase corrections for eMMC
Benjamin Gaignard (1):
ARM: dts: rockchip: Fix IOMMU nodes properties on rk322x
Bixuan Cui (1):
rtc: mxc_v2: add missing MODULE_DEVICE_TABLE
Colin Ian King (1):
scsi: aic7xxx: Fix unintentional sign extension issue on left shift of u8
Corentin Labbe (2):
ARM: dts: gemini: rename mdio to the right name
ARM: dts: gemini: add device_type on pci
Daniel Rosenberg (1):
f2fs: Show casefolding support only when supported
Dmitry Osipenko (4):
ARM: tegra: wm8903: Fix polarity of headphones-detection GPIO in device-trees
ARM: tegra: nexus7: Correct 3v3 regulator GPIO of PM269 variant
memory: tegra: Fix compilation warnings on 64bit platforms thermal/core/thermal_of: Stop zone device before unregistering it
Doug Berger (1):
net: bcmgenet: ensure EXT_ENERGY_DET_MASK is clear
Elaine Zhang (6):
ARM: dts: rockchip: Fix power-controller node names for rk3066a
ARM: dts: rockchip: Fix power-controller node names for rk3188
ARM: dts: rockchip: Fix power-controller node names for rk3288
arm64: dts: rockchip: Fix power-controller node names for px30
arm64: dts: rockchip: Fix power-controller node names for rk3328
arm64: dts: rockchip: Fix power-controller node names for rk3399
Eric Dumazet (3):
tcp: annotate data races around tp->mtu_info
ipv6: tcp: drop silly ICMPv6 packet too big messages
udp: annotate data races around unix_sk(sk)->gso_sizeEtienne Carriere (1):
firmware: arm_scmi: Add SMCCC discovery dependency in Kconfig
Ezequiel Garcia (2):
ARM: dts: rockchip: Fix thermal sensor cells o rk322x
ARM: dts: rockchip: Fix the timer clocks order
Florian Fainelli (1):
net: bcmgenet: Ensure all TX/RX queues DMAs are disabled
Geert Uytterhoeven (1):
thermal/drivers/rcar_gen3_thermal: Do not shadow rcar_gen3_ths_tj_1
Greg Kroah-Hartman (3):
Revert "swap: fix do_swap_page() race with swapoff" Revert "mm/shmem: fix shmem_swapin() race with swapoff" Linux 5.10.53
Grygorii Strashko (4):
ARM: dts: am57xx-cl-som-am57x: fix ti,no-reset-on-init flag for gpios
ARM: dts: am437x-gp-evm: fix ti,no-reset-on-init flag for gpios
ARM: dts: am335x: fix ti,no-reset-on-init flag for gpios
arm64: dts: ti: k3-am654x/j721e/j7200-common-proc-board: Fix MCU_RGMII1_TXC direction
Grzegorz Szymaszek (2):
ARM: dts: stm32: fix stm32mp157c-odyssey card detect pin
ARM: dts: stm32: fix the Odyssey SoM eMMC VQMMC supply
Gu Shengxian (1):
bpftool: Properly close va_list 'ap' by va_end() on error
Hangbin Liu (1):
net: ip_tunnel: fix mtu calculation for ETHER tunnel devices
Heiko Carstens (1):
s390: introduce proper type handling call_on_stack() macro
Ilya Leoshkevich (1):
s390/traps: do not test MONITOR CALL without CONFIG_BUG
Jason Ekstrand (1):
dma-buf/sync_file: Don't leak fences on merge failure
Javed Hasan (2):
scsi: libfc: Fix array index out of bound exception
scsi: qedf: Add check to synchronize abort and flush
Joel Stanley (1):
ARM: dts: aspeed: Fix AST2600 machines line names
Johan Jonker (4):
ARM: dts: rockchip: fix pinctrl sleep nodename for rk3036-kylin and rk3288
arm64: dts: rockchip: fix pinctrl sleep nodename for rk3399.dtsi
arm64: dts: rockchip: fix regulator-gpio states array
ARM: dts: rockchip: fix supply properties in io-domains nodes
John Fastabend (1):
bpf: Track subprog poke descriptors correctly and fix use-after-free
Jonathan Neuschäfer (1):
ARM: imx: pm-imx5: Fix references to imx5_cpu_suspend_info
Kan Liang (1):
perf/x86/intel/uncore: Clean up error handling path of iio mapping
Konstantin Porotchkin (1):
arch/arm64/boot/dts/marvell: fix NAND partitioning scheme
Krzysztof Kozlowski (3):
thermal/drivers/imx_sc: Add missing of_node_put for loop iteration thermal/drivers/sprd: Add missing of_node_put for loop iteration
rtc: max77686: Do not enforce (incorrect) interrupt trigger type
Linus Walleij (2):
ARM: dts: ux500: Fix orientation of accelerometer drm/panel: nt35510: Do not fail if DSI read fails
Louis Peens (1):
net/sched: act_ct: remove and free nf_table callbacks
Lucas Stach (1):
arm64: dts: imx8mq: assign PCIe clocks
Marek Behún (4):
net: dsa: mv88e6xxx: enable .port_set_policy() on Topaz
net: dsa: mv88e6xxx: use correct .stats_set_histogram() on Topaz
net: dsa: mv88e6xxx: enable .rmu_disable() on Topaz
net: dsa: mv88e6xxx: enable devlink ATU hash param for Topaz
Marek Vasut (4):
ARM: dts: stm32: Remove extra size-cells on dhcom-pdk2
ARM: dts: stm32: Fix touchscreen node on dhcom-pdk2
ARM: dts: stm32: Drop unused linux,wakeup from touchscreen node on DHCOM SoM
ARM: dts: stm32: Rename spi-flash/mx66l51235l@N to flash@N on DHCOM SoM
Masahiro Yamada (2):
kbuild: sink stdout from cmd for silent build
kbuild: do not suppress Kconfig prompts for silent build
Matthias Maennich (1):
kbuild: mkcompile_h: consider timestamp if KBUILD_BUILD_TIMESTAMP is set
Mian Yousaf Kaukab (1):
arm64: dts: ls208xa: remove bus-num from dspi node
Mike Rapoport (1):
mm/page_alloc: fix memory map initialization for descending nodes
Nguyen Dinh Phi (1):
tcp: fix tcp_init_transfer() to not reset icsk_ca_initialized
Odin Ugedal (1):
sched/fair: Fix CFS bandwidth hrtimer expiry type
Oleksij Rempel (1):
ARM: dts: imx6dl-riotboard: configure PHY clock and set proper EEE value
Pali Rohár (2):
firmware: turris-mox-rwtm: add marvell,armada-3700-rwtm-firmware compatible string
arm64: dts: marvell: armada-37xx: move firmware node to generic dtsi file
Paolo Abeni (1):
tcp: consistently disable header prediction for mptcp
Paulo Alcantara (1):
cifs: prevent NULL deref in cifs_compose_mount_options()
Pavel Skripkin (4):
net: moxa: fix UAF in moxart_mac_probe
net: qcom/emac: fix UAF in emac_remove
net: ti: fix UAF in tlan_remove_one
net: fddi: fix UAF in fza_probe
Peter Xu (2):
mm/thp: simplify copying of huge zero page pmd when fork mm/userfaultfd: fix uffd-wp special cases for fork()
Philipp Zabel (1):
reset: ti-syscon: fix to_ti_syscon_reset_data macro
Primoz Fiser (1):
ARM: dts: imx6: phyFLEX: Fix UART hardware flow control
Rafał Miłecki (5):
ARM: brcmstb: dts: fix NAND nodes names
ARM: Cygnus: dts: fix NAND nodes names
ARM: NSP: dts: fix NAND nodes names
ARM: dts: BCM63xx: Fix NAND nodes names
ARM: dts: Hurricane 2: Fix NAND nodes names
Riccardo Mancini (1):
perf test bpf: Free obj_buf
Ronak Doshi (1):
vmxnet3: fix cksum offload issues for tunnels with non-default udp ports
Sanket Parmar (1):
usb: cdns3: Enable TDL_CHK only for OUT ep
Sebastian Reichel (2):
ARM: dts: ux500: Fix interrupt cells
ARM: dts: ux500: Rename gpio-controller node
Stefan Wahren (2):
ARM: dts: bcm283x: Fix up MMC node names
ARM: dts: bcm283x: Fix up GPIO LED node names
Sudeep Holla (2):
firmware: arm_scmi: Fix the build when CONFIG_MAILBOX is not selected
arm64: dts: juno: Update SCPI nodes as per the YAML schema
Sujit Kautkar (1):
arm64: dts: qcom: sc7180: Move rmtfs memory region
Suman Anna (1):
ARM: dts: OMAP2+: Replace underscores in sub-mailbox node names
Taehee Yoo (2):
net: netdevsim: use xso.real_dev instead of xso.dev in callback functions of struct xfrmdev_ops
net: validate lwtstate->data before returning from skb_tunnel_info()
Talal Ahmad (1):
tcp: call sk_wmem_schedule before sk_mem_charge in zerocopy path
Thierry Reding (2):
soc/tegra: fuse: Fix Tegra234-only builds
firmware: tegra: bpmp: Fix Tegra234-only builds
Tony Lindgren (1):
ARM: OMAP2+: Block suspend for am3 and am4 if PM is not configured
Vadim Fedorenko (1):
net: ipv6: fix return value of ip6_skb_dst_mtu
Vasily Averin (1):
netfilter: ctnetlink: suspicious RCU usage in ctnetlink_dump_helpinfo
Vladimir Oltean (1):
net: dsa: properly check for the bridge_leave methods in dsa_switch_bridge_leave()
Wei Li (1):
tools: bpf: Fix error in 'make -C tools/ bpf_install'
Wolfgang Bumiller (1):
net: bridge: sync fdb to new unicast-filtering ports
Yang Yingliang (1):
thermal/core: Correct function name thermal_zone_device_unregister()
Yufen Yu (1):
scsi: libsas: Add LUN number check in .slave_alloc callback
wenxu (1):
net/sched: act_ct: fix err check for nf_conntrack_confirm
Greg Kroah-Hartman
maintainerMakefile +6 -5
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 10 -SUBLEVEL = 52 +SUBLEVEL = 53 EXTRAVERSION = NAME = Dare mighty things
@@ -704,11 +704,12 @@ $(KCONFIG_CONFIG): # This exploits the 'multi-target pattern rule' trick. # The syncconfig should be executed only once to make all the targets. # (Note: use the grouped target '&:' when we bump to GNU Make 4.3) -quiet_cmd_syncconfig = SYNC $@ - cmd_syncconfig = $(MAKE) -f $(srctree)/Makefile syncconfig - +# +# Do not use $(call cmd,...) here. That would suppress prompts from syncconfig, +# so you cannot notice that Kconfig is waiting for the user input. %/config/auto.conf %/config/auto.conf.cmd %/generated/autoconf.h: $(KCONFIG_CONFIG) - +$(call cmd,syncconfig) + $(Q)$(kecho) " SYNC $@" + $(Q)$(MAKE) -f $(srctree)/Makefile syncconfig else # !may-sync-config # External modules and some install targets need include/generated/autoconf.h # and include/config/auto.conf but do not care if they are up-to-date.
arch/arm/boot/dts/am335x-baltos.dtsi +2 -2
@@ -393,10 +393,10 @@ &aes { status = "okay"; }; -&gpio0 { +&gpio0_target { ti,no-reset-on-init; }; -&gpio3 { +&gpio3_target { ti,no-reset-on-init; };
arch/arm/boot/dts/am335x-evmsk.dts +1 -1
@@ -648,7 +648,7 @@ &aes { status = "okay"; }; -&gpio0 { +&gpio0_target { ti,no-reset-on-init; };
arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi +1 -1
@@ -150,7 +150,7 @@ &aes { status = "okay"; }; -&gpio0 { +&gpio0_target { ti,no-reset-on-init; };
arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi +1 -1
@@ -353,7 +353,7 @@ &aes { status = "okay"; }; -&gpio0 { +&gpio0_target { ti,no-reset-on-init; };
arch/arm/boot/dts/am33xx-l4.dtsi +1 -1
@@ -1723,7 +1723,7 @@ gpio2: gpio@0 { }; }; - target-module@ae000 { /* 0x481ae000, ap 56 3a.0 */ + gpio3_target: target-module@ae000 { /* 0x481ae000, ap 56 3a.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; reg = <0xae000 0x4>, <0xae010 0x4>,
arch/arm/boot/dts/am437x-gp-evm.dts +4 -1
@@ -813,11 +813,14 @@ &gpio4 { status = "okay"; }; +&gpio5_target { + ti,no-reset-on-init; +}; + &gpio5 { pinctrl-names = "default"; pinctrl-0 = <&display_mux_pins>; status = "okay"; - ti,no-reset-on-init; p8 { /*
arch/arm/boot/dts/am437x-l4.dtsi +1 -1
@@ -2033,7 +2033,7 @@ gpio4: gpio@0 { }; }; - target-module@22000 { /* 0x48322000, ap 116 64.0 */ + gpio5_target: target-module@22000 { /* 0x48322000, ap 116 64.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; reg = <0x22000 0x4>, <0x22010 0x4>,
arch/arm/boot/dts/am57xx-cl-som-am57x.dts +6 -7
@@ -454,20 +454,20 @@ &sata { &mailbox5 { status = "okay"; - mbox_ipu1_ipc3x: mbox_ipu1_ipc3x { + mbox_ipu1_ipc3x: mbox-ipu1-ipc3x { status = "okay"; }; - mbox_dsp1_ipc3x: mbox_dsp1_ipc3x { + mbox_dsp1_ipc3x: mbox-dsp1-ipc3x { status = "okay"; }; }; &mailbox6 { status = "okay"; - mbox_ipu2_ipc3x: mbox_ipu2_ipc3x { + mbox_ipu2_ipc3x: mbox-ipu2-ipc3x { status = "okay"; }; - mbox_dsp2_ipc3x: mbox_dsp2_ipc3x { + mbox_dsp2_ipc3x: mbox-dsp2-ipc3x { status = "okay"; }; };
@@ -610,12 +610,11 @@ &mcasp3 { >; }; -&gpio3 { - status = "okay"; +&gpio3_target { ti,no-reset-on-init; }; -&gpio2 { +&gpio2_target { status = "okay"; ti,no-reset-on-init; };
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts +1 -4
@@ -156,10 +156,7 @@ &gpio0 { /*W0-W7*/ "","","","","","","","", /*X0-X7*/ "","","","","","","","", /*Y0-Y7*/ "","","","","","","","", - /*Z0-Z7*/ "","","","","","","","", - /*AA0-AA7*/ "","","","","","","","", - /*AB0-AB7*/ "","","","","","","","", - /*AC0-AC7*/ "","","","","","","",""; + /*Z0-Z7*/ "","","","","","","",""; pin_mclr_vpp { gpio-hog;
arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts +2 -4
@@ -127,10 +127,7 @@ &gpio0 { /*W0-W7*/ "","","","","","","","", /*X0-X7*/ "","","","","","","","", /*Y0-Y7*/ "","","","","","","","", - /*Z0-Z7*/ "","","","","","","","", - /*AA0-AA7*/ "","","","","","","","", - /*AB0-AB7*/ "","","","","","","","", - /*AC0-AC7*/ "","","","","","","",""; + /*Z0-Z7*/ "","","","","","","",""; }; &fmc {
@@ -180,6 +177,7 @@ &emmc_controller { &emmc { status = "okay"; + clk-phase-mmc-hs200 = <36>, <270>; }; &fsim0 {
arch/arm/boot/dts/bcm-cygnus.dtsi +1 -1
@@ -460,7 +460,7 @@ sdhci1: sdhci@18043000 { status = "disabled"; }; - nand: nand@18046000 { + nand_controller: nand-controller@18046000 { compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1"; reg = <0x18046000 0x600>, <0xf8105408 0x600>, <0x18046f00 0x20>;
arch/arm/boot/dts/bcm-hr2.dtsi +1 -1
@@ -179,7 +179,7 @@ amac0: ethernet@22000 { status = "disabled"; }; - nand: nand@26000 { + nand_controller: nand-controller@26000 { compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1"; reg = <0x26000 0x600>, <0x11b408 0x600>,
arch/arm/boot/dts/bcm-nsp.dtsi +1 -1
@@ -269,7 +269,7 @@ mailbox: mailbox@25c00 { dma-coherent; }; - nand: nand@26000 { + nand_controller: nand-controller@26000 { compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1"; reg = <0x026000 0x600>, <0x11b408 0x600>,
arch/arm/boot/dts/bcm2711-rpi-4-b.dts +2 -2
@@ -28,11 +28,11 @@ aliases { }; leds { - act { + led-act { gpios = <&gpio 42 GPIO_ACTIVE_HIGH>; }; - pwr { + led-pwr { label = "PWR"; gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; default-state = "keep";
arch/arm/boot/dts/bcm2711.dtsi +1 -1
@@ -395,7 +395,7 @@ emmc2bus: emmc2bus { ranges = <0x0 0x7e000000 0x0 0xfe000000 0x01800000>; dma-ranges = <0x0 0xc0000000 0x0 0x00000000 0x40000000>; - emmc2: emmc2@7e340000 { + emmc2: mmc@7e340000 { compatible = "brcm,bcm2711-emmc2"; reg = <0x0 0x7e340000 0x100>; interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts +2 -2
@@ -14,11 +14,11 @@ memory@0 { }; leds { - act { + led-act { gpios = <&gpio 47 GPIO_ACTIVE_HIGH>; }; - pwr { + led-pwr { label = "PWR"; gpios = <&gpio 35 GPIO_ACTIVE_HIGH>; default-state = "keep";
arch/arm/boot/dts/bcm2835-rpi-a.dts +1 -1
@@ -14,7 +14,7 @@ memory@0 { }; leds { - act { + led-act { gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; };
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +2 -2
@@ -15,11 +15,11 @@ memory@0 { }; leds { - act { + led-act { gpios = <&gpio 47 GPIO_ACTIVE_HIGH>; }; - pwr { + led-pwr { label = "PWR"; gpios = <&gpio 35 GPIO_ACTIVE_HIGH>; default-state = "keep";
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts +1 -1
@@ -15,7 +15,7 @@ memory@0 { }; leds { - act { + led-act { gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; };
arch/arm/boot/dts/bcm2835-rpi-b.dts +1 -1
@@ -15,7 +15,7 @@ memory@0 { }; leds { - act { + led-act { gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; };
arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi +1 -1
@@ -5,7 +5,7 @@ / { leds { - act { + led-act { gpios = <&gpio 47 GPIO_ACTIVE_LOW>; }; };
arch/arm/boot/dts/bcm2835-rpi-zero-w.dts +1 -1
@@ -23,7 +23,7 @@ chosen { }; leds { - act { + led-act { gpios = <&gpio 47 GPIO_ACTIVE_LOW>; }; };
arch/arm/boot/dts/bcm2835-rpi-zero.dts +1 -1
@@ -18,7 +18,7 @@ memory@0 { }; leds { - act { + led-act { gpios = <&gpio 47 GPIO_ACTIVE_HIGH>; }; };
arch/arm/boot/dts/bcm2835-rpi.dtsi +1 -1
@@ -4,7 +4,7 @@ / { leds { compatible = "gpio-leds"; - act { + led-act { label = "ACT"; default-state = "keep"; linux,default-trigger = "heartbeat";
arch/arm/boot/dts/bcm2836-rpi-2-b.dts +2 -2
@@ -15,11 +15,11 @@ memory@0 { }; leds { - act { + led-act { gpios = <&gpio 47 GPIO_ACTIVE_HIGH>; }; - pwr { + led-pwr { label = "PWR"; gpios = <&gpio 35 GPIO_ACTIVE_HIGH>; default-state = "keep";
arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts +2 -2
@@ -19,11 +19,11 @@ memory@0 { }; leds { - act { + led-act { gpios = <&gpio 29 GPIO_ACTIVE_HIGH>; }; - pwr { + led-pwr { label = "PWR"; gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; default-state = "keep";
arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts +2 -2
@@ -20,11 +20,11 @@ memory@0 { }; leds { - act { + led-act { gpios = <&gpio 29 GPIO_ACTIVE_HIGH>; }; - pwr { + led-pwr { label = "PWR"; gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; default-state = "keep";
arch/arm/boot/dts/bcm2837-rpi-3-b.dts +1 -1
@@ -20,7 +20,7 @@ memory@0 { }; leds { - act { + led-act { gpios = <&expgpio 2 GPIO_ACTIVE_HIGH>; }; };
arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi +1 -1
@@ -14,7 +14,7 @@ leds { * Since there is no upstream GPIO driver yet, * remove the incomplete node. */ - /delete-node/ act; + /delete-node/ led-act; }; reg_3v3: fixed-regulator {
arch/arm/boot/dts/bcm283x.dtsi +1 -1
@@ -420,7 +420,7 @@ pwm: pwm@7e20c000 { status = "disabled"; }; - sdhci: sdhci@7e300000 { + sdhci: mmc@7e300000 { compatible = "brcm,bcm2835-sdhci"; reg = <0x7e300000 0x100>; interrupts = <2 30>;
arch/arm/boot/dts/bcm63138.dtsi +1 -1
@@ -203,7 +203,7 @@ serial1: serial@620 { status = "disabled"; }; - nand: nand@2000 { + nand_controller: nand-controller@2000 { #address-cells = <1>; #size-cells = <0>; compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.0", "brcm,brcmnand";
arch/arm/boot/dts/bcm7445-bcm97445svmb.dts +2 -2
@@ -14,10 +14,10 @@ memory@0 { }; }; -&nand { +&nand_controller { status = "okay"; - nandcs@1 { + nand@1 { compatible = "brcm,nandcs"; reg = <1>; nand-ecc-step-size = <512>;
arch/arm/boot/dts/bcm7445.dtsi +1 -1
@@ -148,7 +148,7 @@ aon-ctrl@410000 { reg-names = "aon-ctrl", "aon-sram"; }; - nand: nand@3e2800 { + nand_controller: nand-controller@3e2800 { status = "disabled"; #address-cells = <1>; #size-cells = <0>;
arch/arm/boot/dts/bcm911360_entphn.dts +2 -2
@@ -82,8 +82,8 @@ &uart3 { status = "okay"; }; -&nand { - nandcs@1 { +&nand_controller { + nand@1 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958300k.dts +2 -2
@@ -60,8 +60,8 @@ &uart3 { status = "okay"; }; -&nand { - nandcs@1 { +&nand_controller { + nand@1 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958305k.dts +2 -2
@@ -68,8 +68,8 @@ &uart3 { status = "okay"; }; -&nand { - nandcs@1 { +&nand_controller { + nand@1 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958522er.dts +2 -2
@@ -74,8 +74,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958525er.dts +2 -2
@@ -74,8 +74,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958525xmc.dts +2 -2
@@ -90,8 +90,8 @@ rtc@68 { }; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958622hr.dts +2 -2
@@ -78,8 +78,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958623hr.dts +2 -2
@@ -78,8 +78,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958625hr.dts +2 -2
@@ -89,8 +89,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958625k.dts +2 -2
@@ -68,8 +68,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm963138dvt.dts +2 -2
@@ -31,10 +31,10 @@ &serial1 { status = "okay"; }; -&nand { +&nand_controller { status = "okay"; - nandcs@0 { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-ecc-strength = <4>;
arch/arm/boot/dts/bcm988312hr.dts +2 -2
@@ -74,8 +74,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/dm816x.dtsi +1 -1
@@ -351,7 +351,7 @@ mailbox: mailbox@480c8000 { #mbox-cells = <1>; ti,mbox-num-users = <4>; ti,mbox-num-fifos = <12>; - mbox_dsp: mbox_dsp { + mbox_dsp: mbox-dsp { ti,mbox-tx = <3 0 0>; ti,mbox-rx = <0 0 0>; };
arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi +3 -3
@@ -5,17 +5,17 @@ &mailbox5 { status = "okay"; - mbox_ipu1_ipc3x: mbox_ipu1_ipc3x { + mbox_ipu1_ipc3x: mbox-ipu1-ipc3x { status = "okay"; }; - mbox_dsp1_ipc3x: mbox_dsp1_ipc3x { + mbox_dsp1_ipc3x: mbox-dsp1-ipc3x { status = "okay"; }; }; &mailbox6 { status = "okay"; - mbox_ipu2_ipc3x: mbox_ipu2_ipc3x { + mbox_ipu2_ipc3x: mbox-ipu2-ipc3x { status = "okay"; }; };
arch/arm/boot/dts/dra7-l4.dtsi +2 -2
@@ -1315,7 +1315,7 @@ gpio8: gpio@0 { }; }; - target-module@55000 { /* 0x48055000, ap 13 0e.0 */ + gpio2_target: target-module@55000 { /* 0x48055000, ap 13 0e.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; reg = <0x55000 0x4>, <0x55010 0x4>,
@@ -1348,7 +1348,7 @@ gpio2: gpio@0 { }; }; - target-module@57000 { /* 0x48057000, ap 15 06.0 */ + gpio3_target: target-module@57000 { /* 0x48057000, ap 15 06.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; reg = <0x57000 0x4>, <0x57010 0x4>,
arch/arm/boot/dts/dra72x.dtsi +3 -3
@@ -77,12 +77,12 @@ &dss { }; &mailbox5 { - mbox_ipu1_ipc3x: mbox_ipu1_ipc3x { + mbox_ipu1_ipc3x: mbox-ipu1-ipc3x { ti,mbox-tx = <6 2 2>; ti,mbox-rx = <4 2 2>; status = "disabled"; }; - mbox_dsp1_ipc3x: mbox_dsp1_ipc3x { + mbox_dsp1_ipc3x: mbox-dsp1-ipc3x { ti,mbox-tx = <5 2 2>; ti,mbox-rx = <1 2 2>; status = "disabled";
@@ -90,7 +90,7 @@ mbox_dsp1_ipc3x: mbox_dsp1_ipc3x { }; &mailbox6 { - mbox_ipu2_ipc3x: mbox_ipu2_ipc3x { + mbox_ipu2_ipc3x: mbox-ipu2-ipc3x { ti,mbox-tx = <6 2 2>; ti,mbox-rx = <4 2 2>; status = "disabled";
arch/arm/boot/dts/dra74-ipu-dsp-common.dtsi +1 -1
@@ -6,7 +6,7 @@ #include "dra7-ipu-dsp-common.dtsi" &mailbox6 { - mbox_dsp2_ipc3x: mbox_dsp2_ipc3x { + mbox_dsp2_ipc3x: mbox-dsp2-ipc3x { status = "okay"; }; };
arch/arm/boot/dts/dra74x.dtsi +4 -4
@@ -145,12 +145,12 @@ &dss { }; &mailbox5 { - mbox_ipu1_ipc3x: mbox_ipu1_ipc3x { + mbox_ipu1_ipc3x: mbox-ipu1-ipc3x { ti,mbox-tx = <6 2 2>; ti,mbox-rx = <4 2 2>; status = "disabled"; }; - mbox_dsp1_ipc3x: mbox_dsp1_ipc3x { + mbox_dsp1_ipc3x: mbox-dsp1-ipc3x { ti,mbox-tx = <5 2 2>; ti,mbox-rx = <1 2 2>; status = "disabled";
@@ -158,12 +158,12 @@ mbox_dsp1_ipc3x: mbox_dsp1_ipc3x { }; &mailbox6 { - mbox_ipu2_ipc3x: mbox_ipu2_ipc3x { + mbox_ipu2_ipc3x: mbox-ipu2-ipc3x { ti,mbox-tx = <6 2 2>; ti,mbox-rx = <4 2 2>; status = "disabled"; }; - mbox_dsp2_ipc3x: mbox_dsp2_ipc3x { + mbox_dsp2_ipc3x: mbox-dsp2-ipc3x { ti,mbox-tx = <5 2 2>; ti,mbox-rx = <1 2 2>; status = "disabled";
arch/arm/boot/dts/gemini-dlink-dns-313.dts +1 -1
@@ -140,7 +140,7 @@ map1 { }; }; - mdio0: ethernet-phy { + mdio0: mdio { compatible = "virtual,mdio-gpio"; /* Uses MDC and MDIO */ gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */
arch/arm/boot/dts/gemini-nas4220b.dts +1 -1
@@ -62,7 +62,7 @@ led-green-os { }; }; - mdio0: ethernet-phy { + mdio0: mdio { compatible = "virtual,mdio-gpio"; gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */ <&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */
arch/arm/boot/dts/gemini-rut1xx.dts +1 -1
@@ -56,7 +56,7 @@ led-power { }; }; - mdio0: ethernet-phy { + mdio0: mdio { compatible = "virtual,mdio-gpio"; gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */ <&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */
arch/arm/boot/dts/gemini-wbd111.dts +1 -1
@@ -68,7 +68,7 @@ led-greeb-l3 { }; }; - mdio0: ethernet-phy { + mdio0: mdio { compatible = "virtual,mdio-gpio"; gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */ <&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */
arch/arm/boot/dts/gemini-wbd222.dts +1 -1
@@ -67,7 +67,7 @@ led-green-l3 { }; }; - mdio0: ethernet-phy { + mdio0: mdio { compatible = "virtual,mdio-gpio"; gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */ <&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */
arch/arm/boot/dts/gemini.dtsi +1 -0
@@ -286,6 +286,7 @@ pci@50000000 { clock-names = "PCLK", "PCICLK"; pinctrl-names = "default"; pinctrl-0 = <&pci_default_pins>; + device_type = "pci"; #address-cells = <3>; #size-cells = <2>; #interrupt-cells = <1>;
arch/arm/boot/dts/imx6dl-riotboard.dts +2 -0
@@ -106,6 +106,8 @@ rgmii_phy: ethernet-phy@4 { reset-gpios = <&gpio3 31 GPIO_ACTIVE_LOW>; reset-assert-us = <10000>; reset-deassert-us = <1000>; + qca,smarteee-tw-us-1g = <24>; + qca,clk-out-frequency = <125000000>; }; }; };
arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi +3 -2
@@ -315,8 +315,8 @@ pinctrl_uart3: uart3grp { fsl,pins = < MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1 MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1 - MX6QDL_PAD_EIM_D30__UART3_RTS_B 0x1b0b1 - MX6QDL_PAD_EIM_D31__UART3_CTS_B 0x1b0b1 + MX6QDL_PAD_EIM_D31__UART3_RTS_B 0x1b0b1 + MX6QDL_PAD_EIM_D30__UART3_CTS_B 0x1b0b1 >; };
@@ -403,6 +403,7 @@ ®_soc { &uart3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart3>; + uart-has-rtscts; status = "disabled"; };
arch/arm/boot/dts/omap4-l4.dtsi +2 -2
@@ -597,11 +597,11 @@ mailbox: mailbox@0 { #mbox-cells = <1>; ti,mbox-num-users = <3>; ti,mbox-num-fifos = <8>; - mbox_ipu: mbox_ipu { + mbox_ipu: mbox-ipu { ti,mbox-tx = <0 0 0>; ti,mbox-rx = <1 0 0>; }; - mbox_dsp: mbox_dsp { + mbox_dsp: mbox-dsp { ti,mbox-tx = <3 0 0>; ti,mbox-rx = <2 0 0>; };
arch/arm/boot/dts/omap5-l4.dtsi +2 -2
@@ -613,11 +613,11 @@ mailbox: mailbox@0 { #mbox-cells = <1>; ti,mbox-num-users = <3>; ti,mbox-num-fifos = <8>; - mbox_ipu: mbox_ipu { + mbox_ipu: mbox-ipu { ti,mbox-tx = <0 0 0>; ti,mbox-rx = <1 0 0>; }; - mbox_dsp: mbox_dsp { + mbox_dsp: mbox-dsp { ti,mbox-tx = <3 0 0>; ti,mbox-rx = <2 0 0>; };
arch/arm/boot/dts/rk3036-kylin.dts +1 -1
@@ -390,7 +390,7 @@ sdmmc_pwr: sdmmc-pwr { }; }; - sleep { + suspend { global_pwroff: global-pwroff { rockchip,pins = <2 RK_PA7 1 &pcfg_pull_none>; };
arch/arm/boot/dts/rk3066a.dtsi +3 -3
@@ -755,7 +755,7 @@ power: power-controller { #address-cells = <1>; #size-cells = <0>; - pd_vio@RK3066_PD_VIO { + power-domain@RK3066_PD_VIO { reg = <RK3066_PD_VIO>; clocks = <&cru ACLK_LCDC0>, <&cru ACLK_LCDC1>,
@@ -782,7 +782,7 @@ pd_vio@RK3066_PD_VIO { <&qos_rga>; }; - pd_video@RK3066_PD_VIDEO { + power-domain@RK3066_PD_VIDEO { reg = <RK3066_PD_VIDEO>; clocks = <&cru ACLK_VDPU>, <&cru ACLK_VEPU>,
@@ -791,7 +791,7 @@ pd_video@RK3066_PD_VIDEO { pm_qos = <&qos_vpu>; }; - pd_gpu@RK3066_PD_GPU { + power-domain@RK3066_PD_GPU { reg = <RK3066_PD_GPU>; clocks = <&cru ACLK_GPU>; pm_qos = <&qos_gpu>;
arch/arm/boot/dts/rk3188.dtsi +7 -7
@@ -150,16 +150,16 @@ timer3: timer@2000e000 { compatible = "rockchip,rk3188-timer", "rockchip,rk3288-timer"; reg = <0x2000e000 0x20>; interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&cru SCLK_TIMER3>, <&cru PCLK_TIMER3>; - clock-names = "timer", "pclk"; + clocks = <&cru PCLK_TIMER3>, <&cru SCLK_TIMER3>; + clock-names = "pclk", "timer"; }; timer6: timer@200380a0 { compatible = "rockchip,rk3188-timer", "rockchip,rk3288-timer"; reg = <0x200380a0 0x20>; interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&cru SCLK_TIMER6>, <&cru PCLK_TIMER0>; - clock-names = "timer", "pclk"; + clocks = <&cru PCLK_TIMER0>, <&cru SCLK_TIMER6>; + clock-names = "pclk", "timer"; }; i2s0: i2s@1011a000 {
@@ -699,7 +699,7 @@ power: power-controller { #address-cells = <1>; #size-cells = <0>; - pd_vio@RK3188_PD_VIO { + power-domain@RK3188_PD_VIO { reg = <RK3188_PD_VIO>; clocks = <&cru ACLK_LCDC0>, <&cru ACLK_LCDC1>,
@@ -721,7 +721,7 @@ pd_vio@RK3188_PD_VIO { <&qos_rga>; }; - pd_video@RK3188_PD_VIDEO { + power-domain@RK3188_PD_VIDEO { reg = <RK3188_PD_VIDEO>; clocks = <&cru ACLK_VDPU>, <&cru ACLK_VEPU>,
@@ -730,7 +730,7 @@ pd_video@RK3188_PD_VIDEO { pm_qos = <&qos_vpu>; }; - pd_gpu@RK3188_PD_GPU { + power-domain@RK3188_PD_GPU { reg = <RK3188_PD_GPU>; clocks = <&cru ACLK_GPU>; pm_qos = <&qos_gpu>;
arch/arm/boot/dts/rk322x.dtsi +4 -8
@@ -524,7 +524,7 @@ tsadc: tsadc@11150000 { pinctrl-0 = <&otp_pin>; pinctrl-1 = <&otp_out>; pinctrl-2 = <&otp_pin>; - #thermal-sensor-cells = <0>; + #thermal-sensor-cells = <1>; rockchip,hw-tshut-temp = <95000>; status = "disabled"; };
@@ -565,10 +565,9 @@ vpu_mmu: iommu@20020800 { compatible = "rockchip,iommu"; reg = <0x20020800 0x100>; interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "vpu_mmu"; clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>; clock-names = "aclk", "iface"; - iommu-cells = <0>; + #iommu-cells = <0>; status = "disabled"; };
@@ -576,10 +575,9 @@ vdec_mmu: iommu@20030480 { compatible = "rockchip,iommu"; reg = <0x20030480 0x40>, <0x200304c0 0x40>; interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "vdec_mmu"; clocks = <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>; clock-names = "aclk", "iface"; - iommu-cells = <0>; + #iommu-cells = <0>; status = "disabled"; };
@@ -609,7 +607,6 @@ vop_mmu: iommu@20053f00 { compatible = "rockchip,iommu"; reg = <0x20053f00 0x100>; interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "vop_mmu"; clocks = <&cru ACLK_VOP>, <&cru HCLK_VOP>; clock-names = "aclk", "iface"; #iommu-cells = <0>;
@@ -630,10 +627,9 @@ iep_mmu: iommu@20070800 { compatible = "rockchip,iommu"; reg = <0x20070800 0x100>; interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "iep_mmu"; clocks = <&cru ACLK_IEP>, <&cru HCLK_IEP>; clock-names = "aclk", "iface"; - iommu-cells = <0>; + #iommu-cells = <0>; status = "disabled"; };
arch/arm/boot/dts/rk3288-rock2-som.dtsi +1 -1
@@ -218,7 +218,7 @@ &io_domains { flash0-supply = <&vcc_flash>; flash1-supply = <&vccio_pmu>; gpio30-supply = <&vccio_pmu>; - gpio1830 = <&vcc_io>; + gpio1830-supply = <&vcc_io>; lcdc-supply = <&vcc_io>; sdcard-supply = <&vccio_sd>; wifi-supply = <&vcc_18>;
arch/arm/boot/dts/rk3288-vyasa.dts +2 -2
@@ -379,10 +379,10 @@ &io_domains { audio-supply = <&vcc_18>; bb-supply = <&vcc_io>; dvp-supply = <&vcc_io>; - flash0-suuply = <&vcc_18>; + flash0-supply = <&vcc_18>; flash1-supply = <&vcc_lan>; gpio30-supply = <&vcc_io>; - gpio1830 = <&vcc_io>; + gpio1830-supply = <&vcc_io>; lcdc-supply = <&vcc_io>; sdcard-supply = <&vccio_sd>; wifi-supply = <&vcc_18>;
arch/arm/boot/dts/rk3288.dtsi +7 -7
@@ -240,8 +240,8 @@ timer: timer@ff810000 { compatible = "rockchip,rk3288-timer"; reg = <0x0 0xff810000 0x0 0x20>; interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&xin24m>, <&cru PCLK_TIMER>; - clock-names = "timer", "pclk"; + clocks = <&cru PCLK_TIMER>, <&xin24m>; + clock-names = "pclk", "timer"; }; display-subsystem {
@@ -788,7 +788,7 @@ power: power-controller { * *_HDMI HDMI * *_MIPI_* MIPI */ - pd_vio@RK3288_PD_VIO { + power-domain@RK3288_PD_VIO { reg = <RK3288_PD_VIO>; clocks = <&cru ACLK_IEP>, <&cru ACLK_ISP>,
@@ -830,7 +830,7 @@ pd_vio@RK3288_PD_VIO { * Note: The following 3 are HEVC(H.265) clocks, * and on the ACLK_HEVC_NIU (NOC). */ - pd_hevc@RK3288_PD_HEVC { + power-domain@RK3288_PD_HEVC { reg = <RK3288_PD_HEVC>; clocks = <&cru ACLK_HEVC>, <&cru SCLK_HEVC_CABAC>,
@@ -844,7 +844,7 @@ pd_hevc@RK3288_PD_HEVC { * (video endecoder & decoder) clocks that on the * ACLK_VCODEC_NIU and HCLK_VCODEC_NIU (NOC). */ - pd_video@RK3288_PD_VIDEO { + power-domain@RK3288_PD_VIDEO { reg = <RK3288_PD_VIDEO>; clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
@@ -855,7 +855,7 @@ pd_video@RK3288_PD_VIDEO { * Note: ACLK_GPU is the GPU clock, * and on the ACLK_GPU_NIU (NOC). */ - pd_gpu@RK3288_PD_GPU { + power-domain@RK3288_PD_GPU { reg = <RK3288_PD_GPU>; clocks = <&cru ACLK_GPU>; pm_qos = <&qos_gpu_r>,
@@ -1593,7 +1593,7 @@ pcfg_pull_none_12ma: pcfg-pull-none-12ma { drive-strength = <12>; }; - sleep { + suspend { global_pwroff: global-pwroff { rockchip,pins = <0 RK_PA0 1 &pcfg_pull_none>; };
arch/arm/boot/dts/ste-ab8500.dtsi +14 -14
@@ -34,7 +34,7 @@ ab8500_clock: clock-controller { #clock-cells = <1>; }; - ab8500_gpio: ab8500-gpio { + ab8500_gpio: ab8500-gpiocontroller { compatible = "stericsson,ab8500-gpio"; gpio-controller; #gpio-cells = <2>;
@@ -42,15 +42,15 @@ ab8500_gpio: ab8500-gpio { ab8500-rtc { compatible = "stericsson,ab8500-rtc"; - interrupts = <17 IRQ_TYPE_LEVEL_HIGH - 18 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <17 IRQ_TYPE_LEVEL_HIGH>, + <18 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "60S", "ALARM"; }; gpadc: ab8500-gpadc { compatible = "stericsson,ab8500-gpadc"; - interrupts = <32 IRQ_TYPE_LEVEL_HIGH - 39 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <32 IRQ_TYPE_LEVEL_HIGH>, + <39 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "HW_CONV_END", "SW_CONV_END"; vddadc-supply = <&ab8500_ldo_tvout_reg>; #address-cells = <1>;
@@ -169,13 +169,13 @@ ab8500_chargalg { ab8500_usb { compatible = "stericsson,ab8500-usb"; - interrupts = < 90 IRQ_TYPE_LEVEL_HIGH - 96 IRQ_TYPE_LEVEL_HIGH - 14 IRQ_TYPE_LEVEL_HIGH - 15 IRQ_TYPE_LEVEL_HIGH - 79 IRQ_TYPE_LEVEL_HIGH - 74 IRQ_TYPE_LEVEL_HIGH - 75 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <90 IRQ_TYPE_LEVEL_HIGH>, + <96 IRQ_TYPE_LEVEL_HIGH>, + <14 IRQ_TYPE_LEVEL_HIGH>, + <15 IRQ_TYPE_LEVEL_HIGH>, + <79 IRQ_TYPE_LEVEL_HIGH>, + <74 IRQ_TYPE_LEVEL_HIGH>, + <75 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "ID_WAKEUP_R", "ID_WAKEUP_F", "VBUS_DET_F",
@@ -192,8 +192,8 @@ ab8500_usb { ab8500-ponkey { compatible = "stericsson,ab8500-poweron-key"; - interrupts = <6 IRQ_TYPE_LEVEL_HIGH - 7 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <6 IRQ_TYPE_LEVEL_HIGH>, + <7 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "ONKEY_DBF", "ONKEY_DBR"; };
arch/arm/boot/dts/ste-ab8505.dtsi +12 -12
@@ -30,7 +30,7 @@ ab8500_clock: clock-controller { #clock-cells = <1>; }; - ab8505_gpio: ab8505-gpio { + ab8505_gpio: ab8505-gpiocontroller { compatible = "stericsson,ab8505-gpio"; gpio-controller; #gpio-cells = <2>;
@@ -38,8 +38,8 @@ ab8505_gpio: ab8505-gpio { ab8500-rtc { compatible = "stericsson,ab8500-rtc"; - interrupts = <17 IRQ_TYPE_LEVEL_HIGH - 18 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <17 IRQ_TYPE_LEVEL_HIGH>, + <18 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "60S", "ALARM"; };
@@ -131,13 +131,13 @@ ab8500_chargalg { ab8500_usb: ab8500_usb { compatible = "stericsson,ab8500-usb"; - interrupts = < 90 IRQ_TYPE_LEVEL_HIGH - 96 IRQ_TYPE_LEVEL_HIGH - 14 IRQ_TYPE_LEVEL_HIGH - 15 IRQ_TYPE_LEVEL_HIGH - 79 IRQ_TYPE_LEVEL_HIGH - 74 IRQ_TYPE_LEVEL_HIGH - 75 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <90 IRQ_TYPE_LEVEL_HIGH>, + <96 IRQ_TYPE_LEVEL_HIGH>, + <14 IRQ_TYPE_LEVEL_HIGH>, + <15 IRQ_TYPE_LEVEL_HIGH>, + <79 IRQ_TYPE_LEVEL_HIGH>, + <74 IRQ_TYPE_LEVEL_HIGH>, + <75 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "ID_WAKEUP_R", "ID_WAKEUP_F", "VBUS_DET_F",
@@ -154,8 +154,8 @@ ab8500_usb: ab8500_usb { ab8500-ponkey { compatible = "stericsson,ab8500-poweron-key"; - interrupts = <6 IRQ_TYPE_LEVEL_HIGH - 7 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <6 IRQ_TYPE_LEVEL_HIGH>, + <7 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "ONKEY_DBF", "ONKEY_DBR"; };
arch/arm/boot/dts/ste-href-ab8500.dtsi +1 -1
@@ -9,7 +9,7 @@ / { soc { prcmu@80157000 { ab8500 { - ab8500-gpio { + ab8500-gpiocontroller { /* Hog a few default settings */ pinctrl-names = "default"; pinctrl-0 = <&gpio2_default_mode>,
arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi +3 -0
@@ -19,6 +19,9 @@ accelerometer@19 { <19 IRQ_TYPE_EDGE_RISING>; pinctrl-names = "default"; pinctrl-0 = <&accel_tvk_mode>; + mount-matrix = "0", "-1", "0", + "-1", "0", "0", + "0", "0", "-1"; }; magnetometer@1e { compatible = "st,lsm303dlm-magn";
arch/arm/boot/dts/ste-href.dtsi +1 -1
@@ -224,7 +224,7 @@ msp3: msp@80125000 { prcmu@80157000 { ab8500 { - ab8500-gpio { + ab8500-gpiocontroller { }; ab8500_usb {
arch/arm/boot/dts/ste-snowball.dts +1 -1
@@ -376,7 +376,7 @@ spi@80002000 { prcmu@80157000 { ab8500 { - ab8500-gpio { + ab8500-gpiocontroller { /* * AB8500 GPIOs are numbered starting from 1, so the first * index 0 is what in the datasheet is called "GPIO1", and
arch/arm/boot/dts/stm32429i-eval.dts +3 -5
@@ -119,17 +119,15 @@ led-blue { }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; autorepeat; - button@0 { + button-0 { label = "Wake up"; linux,code = <KEY_WAKEUP>; gpios = <&gpioa 0 0>; }; - button@1 { + button-1 { label = "Tamper"; linux,code = <KEY_RESTART>; gpios = <&gpioc 13 0>;
arch/arm/boot/dts/stm32746g-eval.dts +2 -4
@@ -81,12 +81,10 @@ led-blue { }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; autorepeat; - button@0 { + button-0 { label = "Wake up"; linux,code = <KEY_WAKEUP>; gpios = <&gpioc 13 0>;
arch/arm/boot/dts/stm32f429-disco.dts +2 -4
@@ -81,12 +81,10 @@ led-green { }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; autorepeat; - button@0 { + button-0 { label = "User"; linux,code = <KEY_HOME>; gpios = <&gpioa 0 0>;
arch/arm/boot/dts/stm32f429.dtsi +1 -9
@@ -283,8 +283,6 @@ timer@11 { }; timers13: timers@40001c00 { - #address-cells = <1>; - #size-cells = <0>; compatible = "st,stm32-timers"; reg = <0x40001C00 0x400>; clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM13)>;
@@ -299,8 +297,6 @@ pwm { }; timers14: timers@40002000 { - #address-cells = <1>; - #size-cells = <0>; compatible = "st,stm32-timers"; reg = <0x40002000 0x400>; clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM14)>;
@@ -633,8 +629,6 @@ timer@8 { }; timers10: timers@40014400 { - #address-cells = <1>; - #size-cells = <0>; compatible = "st,stm32-timers"; reg = <0x40014400 0x400>; clocks = <&rcc 0 STM32F4_APB2_CLOCK(TIM10)>;
@@ -649,8 +643,6 @@ pwm { }; timers11: timers@40014800 { - #address-cells = <1>; - #size-cells = <0>; compatible = "st,stm32-timers"; reg = <0x40014800 0x400>; clocks = <&rcc 0 STM32F4_APB2_CLOCK(TIM11)>;
@@ -709,7 +701,7 @@ crc: crc@40023000 { status = "disabled"; }; - rcc: rcc@40023810 { + rcc: rcc@40023800 { #reset-cells = <1>; #clock-cells = <2>; compatible = "st,stm32f42xx-rcc", "st,stm32-rcc";
arch/arm/boot/dts/stm32f469-disco.dts +2 -4
@@ -104,12 +104,10 @@ led-blue { }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; autorepeat; - button@0 { + button-0 { label = "User"; linux,code = <KEY_WAKEUP>; gpios = <&gpioa 0 GPIO_ACTIVE_HIGH>;
arch/arm/boot/dts/stm32f746.dtsi +2 -10
@@ -265,8 +265,6 @@ timer@11 { }; timers13: timers@40001c00 { - #address-cells = <1>; - #size-cells = <0>; compatible = "st,stm32-timers"; reg = <0x40001C00 0x400>; clocks = <&rcc 0 STM32F7_APB1_CLOCK(TIM13)>;
@@ -281,8 +279,6 @@ pwm { }; timers14: timers@40002000 { - #address-cells = <1>; - #size-cells = <0>; compatible = "st,stm32-timers"; reg = <0x40002000 0x400>; clocks = <&rcc 0 STM32F7_APB1_CLOCK(TIM14)>;
@@ -364,9 +360,9 @@ i2c2: i2c@40005800 { status = "disabled"; }; - i2c3: i2c@40005C00 { + i2c3: i2c@40005c00 { compatible = "st,stm32f7-i2c"; - reg = <0x40005C00 0x400>; + reg = <0x40005c00 0x400>; interrupts = <72>, <73>; resets = <&rcc STM32F7_APB1_RESET(I2C3)>;
@@ -531,8 +527,6 @@ timer@8 { }; timers10: timers@40014400 { - #address-cells = <1>; - #size-cells = <0>; compatible = "st,stm32-timers"; reg = <0x40014400 0x400>; clocks = <&rcc 0 STM32F7_APB2_CLOCK(TIM10)>;
@@ -547,8 +541,6 @@ pwm { }; timers11: timers@40014800 { - #address-cells = <1>; - #size-cells = <0>; compatible = "st,stm32-timers"; reg = <0x40014800 0x400>; clocks = <&rcc 0 STM32F7_APB2_CLOCK(TIM11)>;
arch/arm/boot/dts/stm32f769-disco.dts +2 -4
@@ -75,12 +75,10 @@ led-red { }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; autorepeat; - button@0 { + button-0 { label = "User"; linux,code = <KEY_HOME>; gpios = <&gpioa 0 GPIO_ACTIVE_HIGH>;
arch/arm/boot/dts/stm32h743.dtsi +0 -4
@@ -454,8 +454,6 @@ trigger@2 { }; lptimer4: timer@58002c00 { - #address-cells = <1>; - #size-cells = <0>; compatible = "st,stm32-lptimer"; reg = <0x58002c00 0x400>; clocks = <&rcc LPTIM4_CK>;
@@ -470,8 +468,6 @@ pwm { }; lptimer5: timer@58003000 { - #address-cells = <1>; - #size-cells = <0>; compatible = "st,stm32-lptimer"; reg = <0x58003000 0x400>; clocks = <&rcc LPTIM5_CK>;
arch/arm/boot/dts/stm32mp151.dtsi +6 -6
@@ -1395,12 +1395,6 @@ crc1: crc@58009000 { status = "disabled"; }; - stmmac_axi_config_0: stmmac-axi-config { - snps,wr_osr_lmt = <0x7>; - snps,rd_osr_lmt = <0x7>; - snps,blen = <0 0 0 0 16 8 4>; - }; - ethernet0: ethernet@5800a000 { compatible = "st,stm32mp1-dwmac", "snps,dwmac-4.20a"; reg = <0x5800a000 0x2000>;
@@ -1424,6 +1418,12 @@ ethernet0: ethernet@5800a000 { snps,axi-config = <&stmmac_axi_config_0>; snps,tso; status = "disabled"; + + stmmac_axi_config_0: stmmac-axi-config { + snps,wr_osr_lmt = <0x7>; + snps,rd_osr_lmt = <0x7>; + snps,blen = <0 0 0 0 16 8 4>; + }; }; usbh_ohci: usbh-ohci@5800c000 {
arch/arm/boot/dts/stm32mp157a-stinger96.dtsi +2 -5
@@ -184,8 +184,6 @@ vtt_ddr: ldo3 { vdd_usb: ldo4 { regulator-name = "vdd_usb"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; interrupts = <IT_CURLIM_LDO4 0>; };
@@ -208,7 +206,6 @@ v1v8: ldo6 { vref_ddr: vref_ddr { regulator-name = "vref_ddr"; regulator-always-on; - regulator-over-current-protection; }; bst_out: boost {
@@ -219,13 +216,13 @@ bst_out: boost { vbus_otg: pwr_sw1 { regulator-name = "vbus_otg"; interrupts = <IT_OCP_OTG 0>; - regulator-active-discharge; + regulator-active-discharge = <1>; }; vbus_sw: pwr_sw2 { regulator-name = "vbus_sw"; interrupts = <IT_OCP_SWOUT 0>; - regulator-active-discharge; + regulator-active-discharge = <1>; }; };
arch/arm/boot/dts/stm32mp157c-odyssey-som.dtsi +2 -5
@@ -173,8 +173,6 @@ vtt_ddr: ldo3 { vdd_usb: ldo4 { regulator-name = "vdd_usb"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; interrupts = <IT_CURLIM_LDO4 0>; };
@@ -197,7 +195,6 @@ v1v2_hdmi: ldo6 { vref_ddr: vref_ddr { regulator-name = "vref_ddr"; regulator-always-on; - regulator-over-current-protection; }; bst_out: boost {
@@ -213,7 +210,7 @@ vbus_otg: pwr_sw1 { vbus_sw: pwr_sw2 { regulator-name = "vbus_sw"; interrupts = <IT_OCP_SWOUT 0>; - regulator-active-discharge; + regulator-active-discharge = <1>; }; };
@@ -269,7 +266,7 @@ &sdmmc2 { st,neg-edge; bus-width = <8>; vmmc-supply = <&v3v3>; - vqmmc-supply = <&v3v3>; + vqmmc-supply = <&vdd>; mmc-ddr-3_3v; status = "okay"; };
arch/arm/boot/dts/stm32mp157c-odyssey.dts +1 -1
@@ -64,7 +64,7 @@ &sdmmc1 { pinctrl-0 = <&sdmmc1_b4_pins_a>; pinctrl-1 = <&sdmmc1_b4_od_pins_a>; pinctrl-2 = <&sdmmc1_b4_sleep_pins_a>; - cd-gpios = <&gpiob 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + cd-gpios = <&gpioi 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; disable-wp; st,neg-edge; bus-width = <4>;
arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi +2 -5
@@ -34,7 +34,6 @@ display_bl: display-bl { gpio-keys-polled { compatible = "gpio-keys-polled"; - #size-cells = <0>; poll-interval = <20>; /*
@@ -60,7 +59,6 @@ button-2 { gpio-keys { compatible = "gpio-keys"; - #size-cells = <0>; button-1 { label = "TA2-GPIO-B";
@@ -184,12 +182,11 @@ sgtl5000_rx_endpoint: endpoint@1 { }; - polytouch@38 { - compatible = "edt,edt-ft5x06"; + touchscreen@38 { + compatible = "edt,edt-ft5406"; reg = <0x38>; interrupt-parent = <&gpiog>; interrupts = <2 IRQ_TYPE_EDGE_FALLING>; /* GPIO E */ - linux,wakeup; }; };
arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi +2 -5
@@ -234,8 +234,6 @@ vtt_ddr: ldo3 { vdd_usb: ldo4 { regulator-name = "vdd_usb"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; interrupts = <IT_CURLIM_LDO4 0>; };
@@ -257,7 +255,6 @@ v1v8: ldo6 { vref_ddr: vref_ddr { regulator-name = "vref_ddr"; regulator-always-on; - regulator-over-current-protection; }; bst_out: boost {
@@ -273,7 +270,7 @@ vbus_otg: pwr_sw1 { vbus_sw: pwr_sw2 { regulator-name = "vbus_sw"; interrupts = <IT_OCP_SWOUT 0>; - regulator-active-discharge; + regulator-active-discharge = <1>; }; };
@@ -338,7 +335,7 @@ &qspi { #size-cells = <0>; status = "okay"; - flash0: mx66l51235l@0 { + flash0: flash@0 { compatible = "jedec,spi-nor"; reg = <0>; spi-rx-bus-width = <4>;
arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi +1 -1
@@ -194,7 +194,7 @@ &qspi { #size-cells = <0>; status = "okay"; - flash0: spi-flash@0 { + flash0: flash@0 { compatible = "jedec,spi-nor"; reg = <0>; spi-rx-bus-width = <4>;
arch/arm/boot/dts/stm32mp15xx-osd32.dtsi +2 -5
@@ -146,8 +146,6 @@ vtt_ddr: ldo3 { vdd_usb: ldo4 { regulator-name = "vdd_usb"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; interrupts = <IT_CURLIM_LDO4 0>; };
@@ -171,7 +169,6 @@ v1v2_hdmi: ldo6 { vref_ddr: vref_ddr { regulator-name = "vref_ddr"; regulator-always-on; - regulator-over-current-protection; }; bst_out: boost {
@@ -182,13 +179,13 @@ bst_out: boost { vbus_otg: pwr_sw1 { regulator-name = "vbus_otg"; interrupts = <IT_OCP_OTG 0>; - regulator-active-discharge; + regulator-active-discharge = <1>; }; vbus_sw: pwr_sw2 { regulator-name = "vbus_sw"; interrupts = <IT_OCP_SWOUT 0>; - regulator-active-discharge; + regulator-active-discharge = <1>; }; };
arch/arm/boot/dts/tegra20-acer-a500-picasso.dts +1 -1
@@ -1009,7 +1009,7 @@ sound { nvidia,audio-codec = <&wm8903>; nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>; - nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>; + nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>; nvidia,int-mic-en-gpios = <&wm8903 1 GPIO_ACTIVE_HIGH>; nvidia,headset;
arch/arm/boot/dts/tegra20-harmony.dts +1 -1
@@ -748,7 +748,7 @@ sound { nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>; nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) - GPIO_ACTIVE_HIGH>; + GPIO_ACTIVE_LOW>; nvidia,int-mic-en-gpios = <&gpio TEGRA_GPIO(X, 0) GPIO_ACTIVE_HIGH>; nvidia,ext-mic-en-gpios = <&gpio TEGRA_GPIO(X, 1)
arch/arm/boot/dts/tegra20-medcom-wide.dts +1 -1
@@ -84,7 +84,7 @@ sound { nvidia,audio-codec = <&wm8903>; nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>; - nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>; + nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>; clocks = <&tegra_car TEGRA20_CLK_PLL_A>, <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
arch/arm/boot/dts/tegra20-plutux.dts +1 -1
@@ -52,7 +52,7 @@ sound { nvidia,audio-codec = <&wm8903>; nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>; - nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>; + nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>; clocks = <&tegra_car TEGRA20_CLK_PLL_A>, <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
arch/arm/boot/dts/tegra20-seaboard.dts +1 -1
@@ -911,7 +911,7 @@ sound { nvidia,audio-codec = <&wm8903>; nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>; - nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(X, 1) GPIO_ACTIVE_HIGH>; + nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(X, 1) GPIO_ACTIVE_LOW>; clocks = <&tegra_car TEGRA20_CLK_PLL_A>, <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
arch/arm/boot/dts/tegra20-tec.dts +1 -1
@@ -61,7 +61,7 @@ sound { nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>; nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) - GPIO_ACTIVE_HIGH>; + GPIO_ACTIVE_LOW>; clocks = <&tegra_car TEGRA20_CLK_PLL_A>, <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
arch/arm/boot/dts/tegra20-ventana.dts +1 -1
@@ -686,7 +686,7 @@ sound { nvidia,audio-codec = <&wm8903>; nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>; - nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>; + nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>; nvidia,int-mic-en-gpios = <&gpio TEGRA_GPIO(X, 0) GPIO_ACTIVE_HIGH>; nvidia,ext-mic-en-gpios = <&gpio TEGRA_GPIO(X, 1)
arch/arm/boot/dts/tegra30-asus-nexus7-grouper-ti-pmic.dtsi +1 -1
@@ -143,7 +143,7 @@ vdd_core: core-regulator@60 { }; vdd_3v3_sys: regulator@1 { - gpio = <&pmic 7 GPIO_ACTIVE_HIGH>; + gpio = <&pmic 6 GPIO_ACTIVE_HIGH>; enable-active-high; }; };
arch/arm/boot/dts/tegra30-cardhu.dtsi +1 -1
@@ -589,7 +589,7 @@ sound { nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>; nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) - GPIO_ACTIVE_HIGH>; + GPIO_ACTIVE_LOW>; clocks = <&tegra_car TEGRA30_CLK_PLL_A>, <&tegra_car TEGRA30_CLK_PLL_A_OUT0>,
arch/arm/mach-imx/suspend-imx53.S +2 -2
@@ -28,11 +28,11 @@ * ^ * ^ * imx53_suspend code - * PM_INFO structure(imx53_suspend_info) + * PM_INFO structure(imx5_cpu_suspend_info) * ======================== low address ======================= */ -/* Offsets of members of struct imx53_suspend_info */ +/* Offsets of members of struct imx5_cpu_suspend_info */ #define SUSPEND_INFO_MX53_M4IF_V_OFFSET 0x0 #define SUSPEND_INFO_MX53_IOMUXC_V_OFFSET 0x4 #define SUSPEND_INFO_MX53_IO_COUNT_OFFSET 0x8
arch/arm/mach-omap2/pm33xx-core.c +40 -0
@@ -8,6 +8,7 @@#include <linux/cpuidle.h> #include <linux/platform_data/pm33xx.h> +#include <linux/suspend.h> #include <asm/cpuidle.h> #include <asm/smp_scu.h> #include <asm/suspend.h>
@@ -324,6 +325,44 @@ static struct am33xx_pm_platform_data *am33xx_pm_get_pdata(void)return NULL ; } +#ifdef CONFIG_SUSPEND +/* +* Block system suspend initially. Later on pm33xx sets up it's own +* platform_suspend_ops after probe. That depends also on loaded +* wkup_m3_ipc and booted am335x-pm-firmware.elf. +*/ +static int amx3_suspend_block (suspend_state_t state) +{ +pr_warn ("PM not initialized for pm33xx, wkup_m3_ipc, or am335x-pm-firmware.elf\n" ); + +return -EINVAL ; +} + +static int amx3_pm_valid (suspend_state_t state) +{ +switch (state) { +case PM_SUSPEND_STANDBY : +return 1 ; +default : +return 0 ; + } +} + +static const struct platform_suspend_ops amx3_blocked_pm_ops = { + .begin = amx3_suspend_block, + .valid = amx3_pm_valid, +}; + +static void __init amx3_block_suspend (void ) +{ +suspend_set_ops (&amx3_blocked_pm_ops); +} +#else +static inline void amx3_block_suspend (void ) +{ +} +#endif /* CONFIG_SUSPEND */ +int __init amx3_common_pm_init (void ) {struct am33xx_pm_platform_data *pdata;
@@ -337,6 +376,7 @@ int __init amx3_common_pm_init(void) devinfo.size_data =sizeof (*pdata); devinfo.id =-1 ;platform_device_register_full (&devinfo); +amx3_block_suspend ();return 0 ; }
arch/arm64/boot/dts/arm/juno-base.dtsi +3 -3
@@ -564,13 +564,13 @@ scpi { clocks { compatible = "arm,scpi-clocks"; - scpi_dvfs: scpi-dvfs { + scpi_dvfs: clocks-0 { compatible = "arm,scpi-dvfs-clocks"; #clock-cells = <1>; clock-indices = <0>, <1>, <2>; clock-output-names = "atlclk", "aplclk","gpuclk"; }; - scpi_clk: scpi-clk { + scpi_clk: clocks-1 { compatible = "arm,scpi-variable-clocks"; #clock-cells = <1>; clock-indices = <3>;
@@ -578,7 +578,7 @@ scpi_clk: scpi-clk { }; }; - scpi_devpd: scpi-power-domains { + scpi_devpd: power-controller { compatible = "arm,scpi-power-domains"; num-domains = <2>; #power-domain-cells = <1>;
arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +0 -1
@@ -625,7 +625,6 @@ dspi: spi@2100000 { clocks = <&clockgen 4 3>; clock-names = "dspi"; spi-num-chipselects = <5>; - bus-num = <0>; }; esdhc: esdhc@2140000 {
arch/arm64/boot/dts/freescale/imx8mq.dtsi +16 -0
@@ -1258,6 +1258,14 @@ pcie0: pcie@33800000 { <&src IMX8MQ_RESET_PCIE_CTRL_APPS_EN>, <&src IMX8MQ_RESET_PCIE_CTRL_APPS_TURNOFF>; reset-names = "pciephy", "apps", "turnoff"; + assigned-clocks = <&clk IMX8MQ_CLK_PCIE1_CTRL>, + <&clk IMX8MQ_CLK_PCIE1_PHY>, + <&clk IMX8MQ_CLK_PCIE1_AUX>; + assigned-clock-parents = <&clk IMX8MQ_SYS2_PLL_250M>, + <&clk IMX8MQ_SYS2_PLL_100M>, + <&clk IMX8MQ_SYS1_PLL_80M>; + assigned-clock-rates = <250000000>, <100000000>, + <10000000>; status = "disabled"; };
@@ -1287,6 +1295,14 @@ pcie1: pcie@33c00000 { <&src IMX8MQ_RESET_PCIE2_CTRL_APPS_EN>, <&src IMX8MQ_RESET_PCIE2_CTRL_APPS_TURNOFF>; reset-names = "pciephy", "apps", "turnoff"; + assigned-clocks = <&clk IMX8MQ_CLK_PCIE2_CTRL>, + <&clk IMX8MQ_CLK_PCIE2_PHY>, + <&clk IMX8MQ_CLK_PCIE2_AUX>; + assigned-clock-parents = <&clk IMX8MQ_SYS2_PLL_250M>, + <&clk IMX8MQ_SYS2_PLL_100M>, + <&clk IMX8MQ_SYS1_PLL_80M>; + assigned-clock-rates = <250000000>, <100000000>, + <10000000>; status = "disabled"; };
arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +2 -4
@@ -108,10 +108,8 @@ sfp: sfp { }; firmware { - turris-mox-rwtm { - compatible = "cznic,turris-mox-rwtm"; - mboxes = <&rwtm 0>; - status = "okay"; + armada-3700-rwtm { + compatible = "marvell,armada-3700-rwtm-firmware", "cznic,turris-mox-rwtm"; }; }; };
arch/arm64/boot/dts/marvell/armada-37xx.dtsi +8 -0
@@ -502,4 +502,12 @@ pcie_intc: interrupt-controller { }; }; }; + + firmware { + armada-3700-rwtm { + compatible = "marvell,armada-3700-rwtm-firmware"; + mboxes = <&rwtm 0>; + status = "okay"; + }; + }; };
arch/arm64/boot/dts/marvell/cn9130-db.dts +1 -1
@@ -258,7 +258,7 @@ partition@0 { }; partition@200000 { label = "Linux"; - reg = <0x200000 0xd00000>; + reg = <0x200000 0xe00000>; }; partition@1000000 { label = "Filesystem";
arch/arm64/boot/dts/qcom/sc7180-idp.dts +1 -1
@@ -45,7 +45,7 @@ chosen { /* Increase the size from 2MB to 8MB */ &rmtfs_mem { - reg = <0x0 0x84400000 0x0 0x800000>; + reg = <0x0 0x94600000 0x0 0x800000>; }; / {
arch/arm64/boot/dts/rockchip/px30.dtsi +8 -8
@@ -244,20 +244,20 @@ power: power-controller { #size-cells = <0>; /* These power domains are grouped by VD_LOGIC */ - pd_usb@PX30_PD_USB { + power-domain@PX30_PD_USB { reg = <PX30_PD_USB>; clocks = <&cru HCLK_HOST>, <&cru HCLK_OTG>, <&cru SCLK_OTG_ADP>; pm_qos = <&qos_usb_host>, <&qos_usb_otg>; }; - pd_sdcard@PX30_PD_SDCARD { + power-domain@PX30_PD_SDCARD { reg = <PX30_PD_SDCARD>; clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>; pm_qos = <&qos_sdmmc>; }; - pd_gmac@PX30_PD_GMAC { + power-domain@PX30_PD_GMAC { reg = <PX30_PD_GMAC>; clocks = <&cru ACLK_GMAC>, <&cru PCLK_GMAC>,
@@ -265,7 +265,7 @@ pd_gmac@PX30_PD_GMAC { <&cru SCLK_GMAC_RX_TX>; pm_qos = <&qos_gmac>; }; - pd_mmc_nand@PX30_PD_MMC_NAND { + power-domain@PX30_PD_MMC_NAND { reg = <PX30_PD_MMC_NAND>; clocks = <&cru HCLK_NANDC>, <&cru HCLK_EMMC>,
@@ -278,14 +278,14 @@ pd_mmc_nand@PX30_PD_MMC_NAND { pm_qos = <&qos_emmc>, <&qos_nand>, <&qos_sdio>, <&qos_sfc>; }; - pd_vpu@PX30_PD_VPU { + power-domain@PX30_PD_VPU { reg = <PX30_PD_VPU>; clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>, <&cru SCLK_CORE_VPU>; pm_qos = <&qos_vpu>, <&qos_vpu_r128>; }; - pd_vo@PX30_PD_VO { + power-domain@PX30_PD_VO { reg = <PX30_PD_VO>; clocks = <&cru ACLK_RGA>, <&cru ACLK_VOPB>,
@@ -301,7 +301,7 @@ pd_vo@PX30_PD_VO { pm_qos = <&qos_rga_rd>, <&qos_rga_wr>, <&qos_vop_m0>, <&qos_vop_m1>; }; - pd_vi@PX30_PD_VI { + power-domain@PX30_PD_VI { reg = <PX30_PD_VI>; clocks = <&cru ACLK_CIF>, <&cru ACLK_ISP>,
@@ -312,7 +312,7 @@ pd_vi@PX30_PD_VI { <&qos_isp_wr>, <&qos_isp_m1>, <&qos_vip>; }; - pd_gpu@PX30_PD_GPU { + power-domain@PX30_PD_GPU { reg = <PX30_PD_GPU>; clocks = <&cru SCLK_GPU>; pm_qos = <&qos_gpu>;
arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts +2 -2
@@ -78,8 +78,8 @@ vcc_sdmmc: vcc-sdmmc { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_HIGH>; - states = <1800000 0x0 - 3300000 0x1>; + states = <1800000 0x0>, + <3300000 0x1>; vin-supply = <&vcc5v0_sys>; };
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +2 -2
@@ -71,8 +71,8 @@ vcc_io_sdio: sdmmcio-regulator { regulator-settling-time-us = <5000>; regulator-type = "voltage"; startup-delay-us = <2000>; - states = <1800000 0x1 - 3300000 0x0>; + states = <1800000 0x1>, + <3300000 0x0>; vin-supply = <&vcc_io_33>; };
arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts +2 -2
@@ -45,8 +45,8 @@ vcc_sd: sdmmc-regulator { vcc_sdio: sdmmcio-regulator { compatible = "regulator-gpio"; gpios = <&grf_gpio 0 GPIO_ACTIVE_HIGH>; - states = <1800000 0x1 - 3300000 0x0>; + states = <1800000 0x1>, + <3300000 0x0>; regulator-name = "vcc_sdio"; regulator-type = "voltage"; regulator-min-microvolt = <1800000>;
arch/arm64/boot/dts/rockchip/rk3328.dtsi +3 -3
@@ -318,13 +318,13 @@ power: power-controller { #address-cells = <1>; #size-cells = <0>; - pd_hevc@RK3328_PD_HEVC { + power-domain@RK3328_PD_HEVC { reg = <RK3328_PD_HEVC>; }; - pd_video@RK3328_PD_VIDEO { + power-domain@RK3328_PD_VIDEO { reg = <RK3328_PD_VIDEO>; }; - pd_vpu@RK3328_PD_VPU { + power-domain@RK3328_PD_VPU { reg = <RK3328_PD_VPU>; clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>; };
arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi +1 -1
@@ -245,7 +245,7 @@ &ppvar_gpu_pwm { }; &ppvar_sd_card_io { - states = <1800000 0x0 3300000 0x1>; + states = <1800000 0x0>, <3300000 0x1>; regulator-max-microvolt = <3300000>; };
arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi +2 -2
@@ -247,8 +247,8 @@ ppvar_sd_card_io: ppvar-sd-card-io { enable-active-high; enable-gpio = <&gpio2 2 GPIO_ACTIVE_HIGH>; gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>; - states = <1800000 0x1 - 3000000 0x0>; + states = <1800000 0x1>, + <3000000 0x0>; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3000000>;
arch/arm64/boot/dts/rockchip/rk3399.dtsi +21 -21
148 lines not on this page · raw message
arch/arm64/boot/dts/ti/k3-am654-base-board.dts +1 -1
@@ -111,7 +111,7 @@ AM65X_WKUP_IOPAD(0x0078, PIN_INPUT, 0) /* (L2) MCU_RGMII1_RD3 */ AM65X_WKUP_IOPAD(0x007c, PIN_INPUT, 0) /* (L5) MCU_RGMII1_RD2 */ AM65X_WKUP_IOPAD(0x0080, PIN_INPUT, 0) /* (M6) MCU_RGMII1_RD1 */ AM65X_WKUP_IOPAD(0x0084, PIN_INPUT, 0) /* (L6) MCU_RGMII1_RD0 */ - AM65X_WKUP_IOPAD(0x0070, PIN_INPUT, 0) /* (N1) MCU_RGMII1_TXC */ + AM65X_WKUP_IOPAD(0x0070, PIN_OUTPUT, 0) /* (N1) MCU_RGMII1_TXC */ AM65X_WKUP_IOPAD(0x0074, PIN_INPUT, 0) /* (M1) MCU_RGMII1_RXC */ >; };
arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts +1 -1
@@ -29,7 +29,7 @@ J721E_WKUP_IOPAD(0x0088, PIN_INPUT, 0) /* MCU_RGMII1_RD3 */ J721E_WKUP_IOPAD(0x008c, PIN_INPUT, 0) /* MCU_RGMII1_RD2 */ J721E_WKUP_IOPAD(0x0090, PIN_INPUT, 0) /* MCU_RGMII1_RD1 */ J721E_WKUP_IOPAD(0x0094, PIN_INPUT, 0) /* MCU_RGMII1_RD0 */ - J721E_WKUP_IOPAD(0x0080, PIN_INPUT, 0) /* MCU_RGMII1_TXC */ + J721E_WKUP_IOPAD(0x0080, PIN_OUTPUT, 0) /* MCU_RGMII1_TXC */ J721E_WKUP_IOPAD(0x0084, PIN_INPUT, 0) /* MCU_RGMII1_RXC */ >; };
arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts +1 -1
@@ -206,7 +206,7 @@ J721E_WKUP_IOPAD(0x0078, PIN_INPUT, 0) /* MCU_RGMII1_RD3 */ J721E_WKUP_IOPAD(0x007c, PIN_INPUT, 0) /* MCU_RGMII1_RD2 */ J721E_WKUP_IOPAD(0x0080, PIN_INPUT, 0) /* MCU_RGMII1_RD1 */ J721E_WKUP_IOPAD(0x0084, PIN_INPUT, 0) /* MCU_RGMII1_RD0 */ - J721E_WKUP_IOPAD(0x0070, PIN_INPUT, 0) /* MCU_RGMII1_TXC */ + J721E_WKUP_IOPAD(0x0070, PIN_OUTPUT, 0) /* MCU_RGMII1_TXC */ J721E_WKUP_IOPAD(0x0074, PIN_INPUT, 0) /* MCU_RGMII1_RXC */ >; };
arch/ia64/include/asm/pgtable.h +3 -2
@@ -520,8 +520,9 @@ extern struct page *zero_page_memmap_ptr;# ifdef CONFIG_VIRTUAL_MEM_MAP /* arch mem_map init routine is needed due to holes in a virtual mem_map */ -extern void memmap_init (unsigned long size,int nid,unsigned long zone, -unsigned long start_pfn); +void memmap_init (void ); +void arch_memmap_init (unsigned long size,int nid,unsigned long zone, +unsigned long start_pfn);# endif /* CONFIG_VIRTUAL_MEM_MAP */ # endif /* !__ASSEMBLY__ */
arch/ia64/mm/init.c +5 -1
@@ -542,7 +542,7 @@ virtual_memmap_init(u64 start, u64 end, void *arg) }void __meminit -memmap_init (unsigned long size,int nid,unsigned long zone, +arch_memmap_init (unsigned long size,int nid,unsigned long zone,unsigned long start_pfn) {if (!vmem_map) {
@@ -562,6 +562,10 @@ memmap_init (unsigned long size, int nid, unsigned long zone, } } +void __init memmap_init (void ) +{ +} +int ia64_pfn_valid (unsigned long pfn) {
arch/s390/include/asm/stacktrace.h +97 -0
103 lines not on this page · raw message
arch/s390/kernel/traps.c +2 -0
@@ -272,6 +272,8 @@ static void __init test_monitor_call(void) {int val =1 ; +if (!IS_ENABLED (CONFIG_BUG )) +return ; asmvolatile (" mc 0,0\n" "0: xgr %0,%0\n"
arch/x86/events/intel/uncore_snbep.c +4 -2
@@ -3752,11 +3752,11 @@ static int skx_iio_set_mapping(struct intel_uncore_type *type)/* One more for NULL. */ attrs =kcalloc ((uncore_max_dies () +1 ),sizeof (*attrs),GFP_KERNEL );if (!attrs) - goto err; + goto clear_topology; eas =kcalloc (uncore_max_dies (),sizeof (*eas),GFP_KERNEL );if (!eas) - goto err; + goto clear_attrs;for (die =0 ; die <uncore_max_dies (); die++) {sprintf (buf,"die%ld" , die);
@@ -3777,7 +3777,9 @@ static int skx_iio_set_mapping(struct intel_uncore_type *type)for (; die >=0 ; die--)kfree (eas[die].attr.attr.name);kfree (eas); +clear_attrs:kfree (attrs); +clear_topology:kfree (type->topology); clear_attr_update: type->attr_update =NULL ;
arch/x86/net/bpf_jit_comp.c +3 -0
@@ -564,6 +564,9 @@ static void bpf_tail_call_direct_fixup(struct bpf_prog *prog)for (i =0 ; i < prog->aux->size_poke_tab; i++) { poke = &prog->aux->poke_tab[i]; +if (poke->aux && poke->aux != prog->aux) +continue ; +WARN_ON_ONCE (READ_ONCE (poke->tailcall_target_stable));if (poke->reason !=BPF_POKE_REASON_TAIL_CALL )
drivers/dma-buf/sync_file.c +7 -6
@@ -211,8 +211,8 @@ static struct sync_file *sync_file_merge(const char *name, struct sync_file *a, struct sync_file *b) {struct sync_file *sync_file; -struct dma_fence **fences, **nfences, **a_fences, **b_fences; -int i, i_a, i_b, num_fences, a_num_fences, b_num_fences; +struct dma_fence **fences =NULL , **nfences, **a_fences, **b_fences; +int i =0 , i_a, i_b, num_fences, a_num_fences, b_num_fences; sync_file =sync_file_alloc ();if (!sync_file)
@@ -236,7 +236,7 @@ static struct sync_file *sync_file_merge(const char *name, struct sync_file *a,* If a sync_file can only be created with sync_file_merge * and sync_file_create, this is a reasonable assumption. */ -for (i = i_a = i_b =0 ; i_a < a_num_fences && i_b < b_num_fences; ) { +for (i_a = i_b =0 ; i_a < a_num_fences && i_b < b_num_fences; ) {struct dma_fence *pt_a = a_fences[i_a];struct dma_fence *pt_b = b_fences[i_b];
@@ -278,15 +278,16 @@ static struct sync_file *sync_file_merge(const char *name, struct sync_file *a, fences = nfences; } -if (sync_file_set_fence (sync_file, fences, i) <0 ) { -kfree (fences); +if (sync_file_set_fence (sync_file, fences, i) <0 ) goto err; - }strlcpy (sync_file->user_name, name,sizeof (sync_file->user_name));return sync_file; err: +while (i) +dma_fence_put (fences[--i]); +kfree (fences);fput (sync_file->file);return NULL ;
drivers/firmware/Kconfig +1 -1
@@ -9,7 +9,7 @@ menu "Firmware Drivers" config ARM_SCMI_PROTOCOL tristate "ARM System Control and Management Interface (SCMI) Message Protocol" depends on ARM || ARM64 || COMPILE_TEST - depends on MAILBOX + depends on MAILBOX || HAVE_ARM_SMCCC_DISCOVERY help ARM System Control and Management Interface (SCMI) protocol is a set of operating system-independent software interfaces that are
drivers/firmware/arm_scmi/common.h +1 -1
@@ -243,7 +243,7 @@ struct scmi_desc { };extern const struct scmi_desc scmi_mailbox_desc; -#ifdef CONFIG_HAVE_ARM_SMCCC +#ifdef CONFIG_HAVE_ARM_SMCCC_DISCOVERY extern const struct scmi_desc scmi_smc_desc;#endif
drivers/firmware/arm_scmi/driver.c +2 -0
@@ -922,7 +922,9 @@ ATTRIBUTE_GROUPS(versions);/* Each compatible listed below must have descriptor associated with it */ static const struct of_device_id scmi_of_match[] = { +#ifdef CONFIG_MAILBOX { .compatible ="arm,scmi" , .data = &scmi_mailbox_desc }, +#endif #ifdef CONFIG_HAVE_ARM_SMCCC_DISCOVERY { .compatible ="arm,scmi-smc" , .data = &scmi_smc_desc}, #endif
drivers/firmware/tegra/Makefile +1 -0
@@ -3,6 +3,7 @@ tegra-bpmp-y = bpmp.o tegra-bpmp-$(CONFIG_ARCH_TEGRA_210_SOC) += bpmp-tegra210.o tegra-bpmp-$(CONFIG_ARCH_TEGRA_186_SOC) += bpmp-tegra186.o tegra-bpmp-$(CONFIG_ARCH_TEGRA_194_SOC) += bpmp-tegra186.o +tegra-bpmp-$(CONFIG_ARCH_TEGRA_234_SOC) += bpmp-tegra186.o tegra-bpmp-$(CONFIG_DEBUG_FS) += bpmp-debugfs.o obj-$(CONFIG_TEGRA_BPMP) += tegra-bpmp.o obj-$(CONFIG_TEGRA_IVC) += ivc.o
drivers/firmware/tegra/bpmp-private.h +2 -1
@@ -24,7 +24,8 @@ struct tegra_bpmp_ops { };#if IS_ENABLED (CONFIG_ARCH_TEGRA_186_SOC ) || \ -IS_ENABLED (CONFIG_ARCH_TEGRA_194_SOC ) +IS_ENABLED (CONFIG_ARCH_TEGRA_194_SOC ) || \ +IS_ENABLED (CONFIG_ARCH_TEGRA_234_SOC )extern const struct tegra_bpmp_ops tegra186_bpmp_ops;#endif #if IS_ENABLED (CONFIG_ARCH_TEGRA_210_SOC )
drivers/firmware/tegra/bpmp.c +2 -1
@@ -809,7 +809,8 @@ static const struct dev_pm_ops tegra_bpmp_pm_ops = { }; #if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) || \ - IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) + IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) || \ + IS_ENABLED(CONFIG_ARCH_TEGRA_234_SOC) static const struct tegra_bpmp_soc tegra186_soc = { .channels = { .cpu_tx = {
drivers/firmware/turris-mox-rwtm.c +1 -0
@@ -569,6 +569,7 @@ static int turris_mox_rwtm_remove(struct platform_device *pdev)static const struct of_device_id turris_mox_rwtm_match[] = { { .compatible ="cznic,turris-mox-rwtm" , }, + { .compatible ="marvell,armada-3700-rwtm-firmware" , }, { }, };
drivers/gpu/drm/panel/panel-novatek-nt35510.c +1 -3
@@ -706,9 +706,7 @@ static int nt35510_power_on(struct nt35510 *nt)if (ret)return ret; - ret =nt35510_read_id (nt); -if (ret) -return ret; +nt35510_read_id (nt);/* Set up stuff in manufacturer control, page 1 */ ret = nt35510_send_long(nt, dsi, MCS_CMD_MAUCCTR,
drivers/memory/tegra/tegra124-emc.c +2 -2
@@ -265,8 +265,8 @@#define EMC_PUTERM_ADJ 0x574#define DRAM_DEV_SEL_ALL 0 -#define DRAM_DEV_SEL_0 (2 << 30) -#define DRAM_DEV_SEL_1 (1 << 30) +#define DRAM_DEV_SEL_0 BIT(31) +#define DRAM_DEV_SEL_1 BIT(30)#define EMC_CFG_POWER_FEATURES_MASK \ (EMC_CFG_DYN_SREF | EMC_CFG_DRAM_ACPD | EMC_CFG_DRAM_CLKSTOP_SR | \
drivers/memory/tegra/tegra30-emc.c +2 -2
@@ -145,8 +145,8 @@#define EMC_SELF_REF_CMD_ENABLED BIT(0)#define DRAM_DEV_SEL_ALL (0 << 30) -#define DRAM_DEV_SEL_0 (2 << 30) -#define DRAM_DEV_SEL_1 (1 << 30) +#define DRAM_DEV_SEL_0 BIT(31) +#define DRAM_DEV_SEL_1 BIT(30)#define DRAM_BROADCAST (num) \ ((num) > 1 ? DRAM_DEV_SEL_ALL : DRAM_DEV_SEL_0)
drivers/net/dsa/mv88e6xxx/chip.c +10 -2
@@ -3407,7 +3407,7 @@ static const struct mv88e6xxx_ops mv88e6141_ops = { .port_set_cmode = mv88e6341_port_set_cmode, .port_setup_message_port = mv88e6xxx_setup_message_port, .stats_snapshot = mv88e6390_g1_stats_snapshot, - .stats_set_histogram = mv88e6095_g1_stats_set_histogram, + .stats_set_histogram = mv88e6390_g1_stats_set_histogram, .stats_get_sset_count = mv88e6320_stats_get_sset_count, .stats_get_strings = mv88e6320_stats_get_strings, .stats_get_stats = mv88e6390_stats_get_stats,
@@ -3417,6 +3417,9 @@ static const struct mv88e6xxx_ops mv88e6141_ops = { .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, .reset = mv88e6352_g1_reset, + .rmu_disable = mv88e6390_g1_rmu_disable, + .atu_get_hash = mv88e6165_g1_atu_get_hash, + .atu_set_hash = mv88e6165_g1_atu_set_hash, .vtu_getnext = mv88e6352_g1_vtu_getnext, .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, .serdes_power = mv88e6390_serdes_power,
@@ -3613,6 +3616,7 @@ static const struct mv88e6xxx_ops mv88e6175_ops = { .port_set_rgmii_delay = mv88e6352_port_set_rgmii_delay, .port_set_speed_duplex = mv88e6185_port_set_speed_duplex, .port_tag_remap = mv88e6095_port_tag_remap, + .port_set_policy = mv88e6352_port_set_policy, .port_set_frame_mode = mv88e6351_port_set_frame_mode, .port_set_egress_floods = mv88e6352_port_set_egress_floods, .port_set_ether_type = mv88e6351_port_set_ether_type,
@@ -4173,7 +4177,7 @@ static const struct mv88e6xxx_ops mv88e6341_ops = { .port_set_cmode = mv88e6341_port_set_cmode, .port_setup_message_port = mv88e6xxx_setup_message_port, .stats_snapshot = mv88e6390_g1_stats_snapshot, - .stats_set_histogram = mv88e6095_g1_stats_set_histogram, + .stats_set_histogram = mv88e6390_g1_stats_set_histogram, .stats_get_sset_count = mv88e6320_stats_get_sset_count, .stats_get_strings = mv88e6320_stats_get_strings, .stats_get_stats = mv88e6390_stats_get_stats,
@@ -4183,6 +4187,9 @@ static const struct mv88e6xxx_ops mv88e6341_ops = { .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, .reset = mv88e6352_g1_reset, + .rmu_disable = mv88e6390_g1_rmu_disable, + .atu_get_hash = mv88e6165_g1_atu_get_hash, + .atu_set_hash = mv88e6165_g1_atu_set_hash, .vtu_getnext = mv88e6352_g1_vtu_getnext, .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, .serdes_power = mv88e6390_serdes_power,
@@ -4253,6 +4260,7 @@ static const struct mv88e6xxx_ops mv88e6351_ops = { .port_set_rgmii_delay = mv88e6352_port_set_rgmii_delay, .port_set_speed_duplex = mv88e6185_port_set_speed_duplex, .port_tag_remap = mv88e6095_port_tag_remap, + .port_set_policy = mv88e6352_port_set_policy, .port_set_frame_mode = mv88e6351_port_set_frame_mode, .port_set_egress_floods = mv88e6352_port_set_egress_floods, .port_set_ether_type = mv88e6351_port_set_ether_type,
drivers/net/ethernet/broadcom/genet/bcmgenet.c +8 -15
@@ -1640,7 +1640,8 @@ static void bcmgenet_power_up(struct bcmgenet_priv *priv,switch (mode) {case GENET_POWER_PASSIVE : - reg &= ~(EXT_PWR_DOWN_DLL |EXT_PWR_DOWN_BIAS ); + reg &= ~(EXT_PWR_DOWN_DLL |EXT_PWR_DOWN_BIAS | +EXT_ENERGY_DET_MASK );if (GENET_IS_V5 (priv)) { reg &= ~(EXT_PWR_DOWN_PHY_EN | EXT_PWR_DOWN_PHY_RD |
@@ -3237,15 +3238,21 @@ static void bcmgenet_get_hw_addr(struct bcmgenet_priv *priv,/* Returns a reusable dma control register value */ static u32 bcmgenet_dma_disable (struct bcmgenet_priv *priv) { +unsigned int i;u32 reg;u32 dma_ctrl;/* disable DMA */ dma_ctrl =1 << (DESC_INDEX +DMA_RING_BUF_EN_SHIFT ) |DMA_EN ; +for (i =0 ; i < priv->hw_params->tx_queues; i++) + dma_ctrl |= (1 << (i +DMA_RING_BUF_EN_SHIFT )); reg =bcmgenet_tdma_readl (priv,DMA_CTRL ); reg &= ~dma_ctrl;bcmgenet_tdma_writel (priv, reg,DMA_CTRL ); + dma_ctrl =1 << (DESC_INDEX +DMA_RING_BUF_EN_SHIFT ) |DMA_EN ; +for (i =0 ; i < priv->hw_params->rx_queues; i++) + dma_ctrl |= (1 << (i +DMA_RING_BUF_EN_SHIFT )); reg =bcmgenet_rdma_readl (priv,DMA_CTRL ); reg &= ~dma_ctrl;bcmgenet_rdma_writel (priv, reg,DMA_CTRL );
@@ -3292,7 +3299,6 @@ static int bcmgenet_open(struct net_device *dev) {struct bcmgenet_priv *priv =netdev_priv (dev);unsigned long dma_ctrl; -u32 reg;int ret;netif_dbg (priv, ifup, dev,"bcmgenet_open\n" );
@@ -3318,12 +3324,6 @@ static int bcmgenet_open(struct net_device *dev)bcmgenet_set_hw_addr (priv, dev->dev_addr); -if (priv->internal_phy) { - reg =bcmgenet_ext_readl (priv,EXT_EXT_PWR_MGMT ); - reg |=EXT_ENERGY_DET_MASK ; -bcmgenet_ext_writel (priv, reg,EXT_EXT_PWR_MGMT ); - } -/* Disable RX/TX DMA and flush TX queues */ dma_ctrl =bcmgenet_dma_disable (priv);
@@ -4139,7 +4139,6 @@ static int bcmgenet_resume(struct device *d)struct bcmgenet_priv *priv =netdev_priv (dev);struct bcmgenet_rxnfc_rule *rule;unsigned long dma_ctrl; -u32 reg;int ret;if (!netif_running (dev))
@@ -4176,12 +4175,6 @@ static int bcmgenet_resume(struct device *d)if (rule->state !=BCMGENET_RXNFC_STATE_UNUSED )bcmgenet_hfb_create_rxnfc_filter (priv, rule); -if (priv->internal_phy) { - reg =bcmgenet_ext_readl (priv,EXT_EXT_PWR_MGMT ); - reg |=EXT_ENERGY_DET_MASK ; -bcmgenet_ext_writel (priv, reg,EXT_EXT_PWR_MGMT ); - } -/* Disable RX/TX DMA and flush TX queues */ dma_ctrl =bcmgenet_dma_disable (priv);
drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c +0 -6
@@ -187,12 +187,6 @@ int bcmgenet_wol_power_down_cfg(struct bcmgenet_priv *priv, reg |=CMD_RX_EN ;bcmgenet_umac_writel (priv, reg,UMAC_CMD ); -if (priv->hw_params->flags &GENET_HAS_EXT ) { - reg =bcmgenet_ext_readl (priv,EXT_EXT_PWR_MGMT ); - reg &= ~EXT_ENERGY_DET_MASK ; -bcmgenet_ext_writel (priv, reg,EXT_EXT_PWR_MGMT ); - } - reg =UMAC_IRQ_MPD_R ;if (hfb_enable) reg |=UMAC_IRQ_HFB_SM |UMAC_IRQ_HFB_MM ;
drivers/net/ethernet/moxa/moxart_ether.c +1 -3
@@ -541,10 +541,8 @@ static int moxart_mac_probe(struct platform_device *pdev)SET_NETDEV_DEV (ndev, &pdev->dev); ret =register_netdev (ndev); -if (ret) { -free_netdev (ndev); +if (ret) goto init_fail; - }netdev_dbg (ndev,"%s: IRQ=%d address=%pM\n" , __func__, ndev->irq, ndev->dev_addr);
drivers/net/ethernet/qualcomm/emac/emac.c +2 -1
@@ -735,12 +735,13 @@ static int emac_remove(struct platform_device *pdev)put_device (&adpt->phydev->mdio.dev);mdiobus_unregister (adpt->mii_bus); -free_netdev (netdev);if (adpt->phy.digital)iounmap (adpt->phy.digital);iounmap (adpt->phy.base); +free_netdev (netdev); +return 0 ; }
drivers/net/ethernet/ti/tlan.c +1 -2
@@ -313,9 +313,8 @@ static void tlan_remove_one(struct pci_dev *pdev)pci_release_regions (pdev);#endif -free_netdev (dev); -cancel_work_sync (&priv->tlan_tqueue); +free_netdev (dev); }static void tlan_start (struct net_device *dev)
drivers/net/fddi/defza.c +1 -2
@@ -1504,9 +1504,8 @@ static int fza_probe(struct device *bdev)release_mem_region (start, len); err_out_kfree: -free_netdev (dev); -pr_err ("%s: initialization failure, aborting!\n" , fp->name); +free_netdev (dev);return ret; }
drivers/net/netdevsim/ipsec.c +4 -4
@@ -85,7 +85,7 @@ static int nsim_ipsec_parse_proto_keys(struct xfrm_state *xs, u32 *mykey, u32 *mysalt) {const char aes_gcm_name[] ="rfc4106(gcm(aes))" ; -struct net_device *dev = xs->xso.dev; +struct net_device *dev = xs->xso.real_dev;unsigned char *key_data;char *alg_name =NULL ;int key_len;
@@ -134,7 +134,7 @@ static int nsim_ipsec_add_sa(struct xfrm_state *xs)u16 sa_idx;int ret; - dev = xs->xso.dev; + dev = xs->xso.real_dev; ns =netdev_priv (dev); ipsec = &ns->ipsec;
@@ -194,7 +194,7 @@ static int nsim_ipsec_add_sa(struct xfrm_state *xs)static void nsim_ipsec_del_sa (struct xfrm_state *xs) { -struct netdevsim *ns =netdev_priv (xs->xso.dev); +struct netdevsim *ns =netdev_priv (xs->xso.real_dev);struct nsim_ipsec *ipsec = &ns->ipsec;u16 sa_idx;
@@ -211,7 +211,7 @@ static void nsim_ipsec_del_sa(struct xfrm_state *xs)static bool nsim_ipsec_offload_ok (struct sk_buff *skb,struct xfrm_state *xs) { -struct netdevsim *ns =netdev_priv (xs->xso.dev); +struct netdevsim *ns =netdev_priv (xs->xso.real_dev);struct nsim_ipsec *ipsec = &ns->ipsec; ipsec->ok++;
drivers/net/vmxnet3/vmxnet3_ethtool.c +20 -2
@@ -1,7 +1,7 @@/* * Linux driver for VMware's vmxnet3 ethernet NIC. * -* Copyright (C) 2008-2020, VMware, Inc. All Rights Reserved. +* Copyright (C) 2008-2021, VMware, Inc. All Rights Reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the
@@ -26,6 +26,10 @@#include "vmxnet3_int.h" +#include <net/vxlan.h> +#include <net/geneve.h> + +#define VXLAN_UDP_PORT 8472struct vmxnet3_stat_desc {char desc[ETH_GSTRING_LEN ];
@@ -277,6 +281,8 @@ netdev_features_t vmxnet3_features_check(struct sk_buff *skb,if (VMXNET3_VERSION_GE_4 (adapter) && skb->encapsulation && skb->ip_summed ==CHECKSUM_PARTIAL ) {u8 l4_proto =0 ; +u16 port; +struct udphdr *udph;switch (vlan_get_protocol (skb)) {case htons (ETH_P_IP ):
@@ -289,8 +295,20 @@ netdev_features_t vmxnet3_features_check(struct sk_buff *skb,return features & ~(NETIF_F_CSUM_MASK |NETIF_F_GSO_MASK ); } -if (l4_proto !=IPPROTO_UDP ) +switch (l4_proto) { +case IPPROTO_UDP : + udph =udp_hdr (skb); + port =be16_to_cpu (udph->dest); +/* Check if offloaded port is supported */ +if (port !=GENEVE_UDP_PORT && + port !=IANA_VXLAN_UDP_PORT && + port !=VXLAN_UDP_PORT ) { +return features & ~(NETIF_F_CSUM_MASK |NETIF_F_GSO_MASK ); + } +break ; +default :return features & ~(NETIF_F_CSUM_MASK |NETIF_F_GSO_MASK ); + } }return features; }
drivers/reset/reset-ti-syscon.c +2 -2
@@ -58,8 +58,8 @@ struct ti_syscon_reset_data {unsigned int nr_controls; }; -#define to_ti_syscon_reset_data (rcdev) \ - container_of(rcdev, struct ti_syscon_reset_data, rcdev) +#define to_ti_syscon_reset_data (_rcdev) \ + container_of(_rcdev, struct ti_syscon_reset_data, rcdev)/** * ti_syscon_reset_assert() - assert device reset
drivers/rtc/rtc-max77686.c +2 -2
@@ -717,8 +717,8 @@ static int max77686_init_rtc_regmap(struct max77686_rtc_info *info) add_rtc_irq: ret =regmap_add_irq_chip (info->rtc_regmap, info->rtc_irq, -IRQF_TRIGGER_FALLING |IRQF_ONESHOT | -IRQF_SHARED ,0 , info->drv_data->rtc_irq_chip, +IRQF_ONESHOT |IRQF_SHARED , +0 , info->drv_data->rtc_irq_chip, &info->rtc_irq_data);if (ret <0 ) {dev_err (info->dev,"Failed to add RTC irq chip: %d\n" , ret);
drivers/rtc/rtc-mxc_v2.c +1 -0
@@ -373,6 +373,7 @@ static const struct of_device_id mxc_ids[] = { { .compatible = "fsl,imx53-rtc", }, {} }; +MODULE_DEVICE_TABLE (of, mxc_ids);static struct platform_driver mxc_rtc_driver = { .driver = {
drivers/scsi/aic7xxx/aic7xxx_core.c +1 -1
@@ -493,7 +493,7 @@ ahc_inq(struct ahc_softc *ahc, u_int port)return ((ahc_inb (ahc, port)) | (ahc_inb (ahc, port+1 ) <<8 ) | (ahc_inb (ahc, port+2 ) <<16 ) - | (ahc_inb (ahc, port+3 ) <<24 ) + | (((uint64_t )ahc_inb (ahc, port+3 )) <<24 ) | (((uint64_t )ahc_inb (ahc, port+4 )) <<32 ) | (((uint64_t )ahc_inb (ahc, port+5 )) <<40 ) | (((uint64_t)ahc_inb(ahc, port+6)) << 48)
drivers/scsi/aic94xx/aic94xx_init.c +1 -0
@@ -53,6 +53,7 @@ static struct scsi_host_template aic94xx_sht = { .max_sectors = SCSI_DEFAULT_MAX_SECTORS, .eh_device_reset_handler = sas_eh_device_reset_handler, .eh_target_reset_handler = sas_eh_target_reset_handler, + .slave_alloc = sas_slave_alloc, .target_destroy = sas_target_destroy, .ioctl = sas_ioctl,#ifdef CONFIG_COMPAT
drivers/scsi/hisi_sas/hisi_sas_v1_hw.c +1 -0
@@ -1769,6 +1769,7 @@ static struct scsi_host_template sht_v1_hw = { .max_sectors = SCSI_DEFAULT_MAX_SECTORS, .eh_device_reset_handler = sas_eh_device_reset_handler, .eh_target_reset_handler = sas_eh_target_reset_handler, + .slave_alloc = sas_slave_alloc, .target_destroy = sas_target_destroy, .ioctl = sas_ioctl,#ifdef CONFIG_COMPAT
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +1 -0
@@ -3545,6 +3545,7 @@ static struct scsi_host_template sht_v2_hw = { .max_sectors = SCSI_DEFAULT_MAX_SECTORS, .eh_device_reset_handler = sas_eh_device_reset_handler, .eh_target_reset_handler = sas_eh_target_reset_handler, + .slave_alloc = sas_slave_alloc, .target_destroy = sas_target_destroy, .ioctl = sas_ioctl,#ifdef CONFIG_COMPAT
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +1 -0
@@ -3126,6 +3126,7 @@ static struct scsi_host_template sht_v3_hw = { .max_sectors = SCSI_DEFAULT_MAX_SECTORS, .eh_device_reset_handler = sas_eh_device_reset_handler, .eh_target_reset_handler = sas_eh_target_reset_handler, + .slave_alloc = sas_slave_alloc, .target_destroy = sas_target_destroy, .ioctl = sas_ioctl,#ifdef CONFIG_COMPAT
drivers/scsi/isci/init.c +1 -0
@@ -167,6 +167,7 @@ static struct scsi_host_template isci_sht = { .eh_abort_handler = sas_eh_abort_handler, .eh_device_reset_handler = sas_eh_device_reset_handler, .eh_target_reset_handler = sas_eh_target_reset_handler, + .slave_alloc = sas_slave_alloc, .target_destroy = sas_target_destroy, .ioctl = sas_ioctl, #ifdef CONFIG_COMPAT
drivers/scsi/libfc/fc_rport.c +8 -5
@@ -1162,6 +1162,7 @@ static void fc_rport_prli_resp(struct fc_seq *sp, struct fc_frame *fp, resp_code = (pp->spp.spp_flags &FC_SPP_RESP_MASK );FC_RPORT_DBG (rdata,"PRLI spp_flags = 0x%x spp_type 0x%x\n" , pp->spp.spp_flags, pp->spp.spp_type); + rdata->spp_type = pp->spp.spp_type;if (resp_code !=FC_SPP_RESP_ACK ) {if (resp_code ==FC_SPP_RESP_CONF )
@@ -1184,11 +1185,13 @@ static void fc_rport_prli_resp(struct fc_seq *sp, struct fc_frame *fp,/* * Call prli provider if we should act as a target */ - prov = fc_passive_prov[rdata->spp_type]; -if (prov) { -memset (&temp_spp,0 ,sizeof (temp_spp)); - prov->prli (rdata, pp->prli.prli_spp_len, - &pp->spp, &temp_spp); +if (rdata->spp_type <FC_FC4_PROV_SIZE ) { + prov = fc_passive_prov[rdata->spp_type]; +if (prov) { +memset (&temp_spp,0 ,sizeof (temp_spp)); + prov->prli (rdata, pp->prli.prli_spp_len, + &pp->spp, &temp_spp); + } }/* * Check if the image pair could be established
drivers/scsi/libsas/sas_scsi_host.c +9 -0
@@ -911,6 +911,14 @@ void sas_task_abort(struct sas_task *task)blk_abort_request (sc->request); } +int sas_slave_alloc (struct scsi_device *sdev) +{ +if (dev_is_sata (sdev_to_domain_dev (sdev)) && sdev->lun) +return -ENXIO ; + +return 0 ; +} +void sas_target_destroy (struct scsi_target *starget) {struct domain_device *found_dev = starget->hostdata;
@@ -957,5 +965,6 @@ EXPORT_SYMBOL_GPL(sas_task_abort);EXPORT_SYMBOL_GPL (sas_phy_reset);EXPORT_SYMBOL_GPL (sas_eh_device_reset_handler);EXPORT_SYMBOL_GPL (sas_eh_target_reset_handler); +EXPORT_SYMBOL_GPL (sas_slave_alloc);EXPORT_SYMBOL_GPL (sas_target_destroy);EXPORT_SYMBOL_GPL (sas_ioctl);
drivers/scsi/mvsas/mv_init.c +1 -0
@@ -46,6 +46,7 @@ static struct scsi_host_template mvs_sht = { .max_sectors = SCSI_DEFAULT_MAX_SECTORS, .eh_device_reset_handler = sas_eh_device_reset_handler, .eh_target_reset_handler = sas_eh_target_reset_handler, + .slave_alloc = sas_slave_alloc, .target_destroy = sas_target_destroy, .ioctl = sas_ioctl,#ifdef CONFIG_COMPAT
drivers/scsi/pm8001/pm8001_init.c +1 -0
@@ -101,6 +101,7 @@ static struct scsi_host_template pm8001_sht = { .max_sectors = SCSI_DEFAULT_MAX_SECTORS, .eh_device_reset_handler = sas_eh_device_reset_handler, .eh_target_reset_handler = sas_eh_target_reset_handler, + .slave_alloc = sas_slave_alloc, .target_destroy = sas_target_destroy, .ioctl = sas_ioctl,#ifdef CONFIG_COMPAT
drivers/scsi/qedf/qedf_io.c +21 -1
@@ -1520,9 +1520,19 @@ void qedf_process_error_detect(struct qedf_ctx *qedf, struct fcoe_cqe *cqe, {int rval; +if (io_req ==NULL ) { +QEDF_INFO (NULL ,QEDF_LOG_IO ,"io_req is NULL.\n" ); +return ; + } + +if (io_req->fcport ==NULL ) { +QEDF_INFO (NULL ,QEDF_LOG_IO ,"fcport is NULL.\n" ); +return ; + } +if (!cqe) {QEDF_INFO (&qedf->dbg_ctx,QEDF_LOG_IO , -"cqe is NULL for io_req %p\n" , io_req); +"cqe is NULL for io_req %p\n" , io_req);return ; }
@@ -1538,6 +1548,16 @@ void qedf_process_error_detect(struct qedf_ctx *qedf, struct fcoe_cqe *cqe,le32_to_cpu (cqe->cqe_info.err_info.rx_buf_off), le32_to_cpu(cqe->cqe_info.err_info.rx_id)); +/* When flush is active, let the cmds be flushed out from the cleanup context */ +if (test_bit (QEDF_RPORT_IN_TARGET_RESET , &io_req->fcport->flags) || + (test_bit (QEDF_RPORT_IN_LUN_RESET , &io_req->fcport->flags) && + io_req->sc_cmd->device->lun == (u64 )io_req->fcport->lun_reset_lun)) { +QEDF_ERR (&qedf->dbg_ctx, +"Dropping EQE for xid=0x%x as fcport is flushing" , + io_req->xid); +return ; + } +if (qedf->stop_io_on_error) {qedf_stop_all_io (qedf);return ;
drivers/soc/tegra/fuse/fuse-tegra30.c +2 -1
@@ -37,7 +37,8 @@defined (CONFIG_ARCH_TEGRA_132_SOC ) || \defined (CONFIG_ARCH_TEGRA_210_SOC ) || \defined (CONFIG_ARCH_TEGRA_186_SOC ) || \ - defined(CONFIG_ARCH_TEGRA_194_SOC) +defined (CONFIG_ARCH_TEGRA_194_SOC ) || \ + defined(CONFIG_ARCH_TEGRA_234_SOC)static u32 tegra30_fuse_read_early (struct tegra_fuse *fuse,unsigned int offset) {if (WARN_ON (!fuse->base))
drivers/thermal/imx_sc_thermal.c +3 -0
@@ -93,6 +93,7 @@ static int imx_sc_thermal_probe(struct platform_device *pdev)for_each_available_child_of_node (np, child) { sensor =devm_kzalloc (&pdev->dev,sizeof (*sensor),GFP_KERNEL );if (!sensor) { +of_node_put (child);of_node_put (sensor_np);return -ENOMEM ; }
@@ -104,6 +105,7 @@ static int imx_sc_thermal_probe(struct platform_device *pdev)dev_err (&pdev->dev,"failed to get valid sensor resource id: %d\n" , ret); +of_node_put (child);break ; }
@@ -114,6 +116,7 @@ static int imx_sc_thermal_probe(struct platform_device *pdev)if (IS_ERR (sensor->tzd)) {dev_err (&pdev->dev,"failed to register thermal zone\n" ); ret =PTR_ERR (sensor->tzd); +of_node_put (child);break ; }
drivers/thermal/rcar_gen3_thermal.c +2 -3
@@ -366,7 +366,7 @@ static int rcar_gen3_thermal_probe(struct platform_device *pdev) {struct rcar_gen3_thermal_priv *priv;struct device *dev = &pdev->dev; -const int *rcar_gen3_ths_tj_1 =of_device_get_match_data (dev); +const int *ths_tj_1 =of_device_get_match_data (dev);struct resource *res;struct thermal_zone_device *zone;int ret, irq, i;
@@ -434,8 +434,7 @@ static int rcar_gen3_thermal_probe(struct platform_device *pdev) priv->tscs[i] = tsc; priv->thermal_init (tsc); -rcar_gen3_thermal_calc_coefs (tsc, ptat, thcodes[i], - *rcar_gen3_ths_tj_1); +rcar_gen3_thermal_calc_coefs (tsc, ptat, thcodes[i], *ths_tj_1); zone =devm_thermal_zone_of_sensor_register (dev, i, tsc, &rcar_gen3_tz_of_ops);
drivers/thermal/sprd_thermal.c +9 -6
@@ -388,7 +388,7 @@ static int sprd_thm_probe(struct platform_device *pdev) sen =devm_kzalloc (&pdev->dev,sizeof (*sen),GFP_KERNEL );if (!sen) { ret = -ENOMEM ; - goto disable_clk; + goto of_put; } sen->data = thm;
@@ -397,13 +397,13 @@ static int sprd_thm_probe(struct platform_device *pdev) ret =of_property_read_u32 (sen_child,"reg" , &sen->id);if (ret) {dev_err (&pdev->dev,"get sensor reg failed" ); - goto disable_clk; + goto of_put; } ret =sprd_thm_sensor_calibration (sen_child, thm, sen);if (ret) {dev_err (&pdev->dev,"efuse cal analysis failed" ); - goto disable_clk; + goto of_put; }sprd_thm_sensor_init (thm, sen);
@@ -416,19 +416,20 @@ static int sprd_thm_probe(struct platform_device *pdev)dev_err (&pdev->dev,"register thermal zone failed %d\n" , sen->id); ret =PTR_ERR (sen->tzd); - goto disable_clk; + goto of_put; } thm->sensor[sen->id] = sen; } +/* sen_child set to NULL at this point */ ret =sprd_thm_set_ready (thm);if (ret) - goto disable_clk; + goto of_put; ret =sprd_thm_wait_temp_ready (thm);if (ret) - goto disable_clk; + goto of_put;for (i =0 ; i < thm->nr_sensors; i++)sprd_thm_toggle_sensor (thm->sensor[i], true);
@@ -436,6 +437,8 @@ static int sprd_thm_probe(struct platform_device *pdev)platform_set_drvdata (pdev, thm);return 0 ; +of_put: +of_node_put (sen_child); disable_clk:clk_disable_unprepare (thm->clk);return ret;
drivers/thermal/thermal_core.c +1 -1
@@ -1509,7 +1509,7 @@ thermal_zone_device_register(const char *type, int trips, int mask,EXPORT_SYMBOL_GPL (thermal_zone_device_register);/** -* thermal_device_unregister - removes the registered thermal zone device +* thermal_zone_device_unregister - removes the registered thermal zone device * @tz: the thermal zone device to remove */ void thermal_zone_device_unregister (struct thermal_zone_device *tz)
drivers/thermal/thermal_of.c +3 -0
@@ -559,6 +559,9 @@ void thermal_zone_of_sensor_unregister(struct device *dev,if (!tz)return ; +/* stop temperature polling */ +thermal_zone_device_disable (tzd); +mutex_lock (&tzd->lock); tzd->ops->get_temp =NULL ; tzd->ops->get_trend =NULL ;
drivers/usb/cdns3/gadget.c +3 -5
@@ -2006,7 +2006,7 @@ static void cdns3_configure_dmult(struct cdns3_device *priv_dev,else mask =BIT (priv_ep->num); -if (priv_ep->type !=USB_ENDPOINT_XFER_ISOC ) { +if (priv_ep->type !=USB_ENDPOINT_XFER_ISOC && !priv_ep->dir) {cdns3_set_register_bit (®s->tdl_from_trb, mask);cdns3_set_register_bit (®s->tdl_beh, mask);cdns3_set_register_bit (®s->tdl_beh2, mask);
@@ -2045,15 +2045,13 @@ int cdns3_ep_config(struct cdns3_endpoint *priv_ep, bool enable)case USB_ENDPOINT_XFER_INT : ep_cfg =EP_CFG_EPTYPE (USB_ENDPOINT_XFER_INT ); -if ((priv_dev->dev_ver ==DEV_VER_V2 && !priv_ep->dir) || - priv_dev->dev_ver >DEV_VER_V2 ) +if (priv_dev->dev_ver >=DEV_VER_V2 && !priv_ep->dir) ep_cfg |=EP_CFG_TDL_CHK ;break ;case USB_ENDPOINT_XFER_BULK : ep_cfg =EP_CFG_EPTYPE (USB_ENDPOINT_XFER_BULK ); -if ((priv_dev->dev_ver ==DEV_VER_V2 && !priv_ep->dir) || - priv_dev->dev_ver >DEV_VER_V2 ) +if (priv_dev->dev_ver >=DEV_VER_V2 && !priv_ep->dir) ep_cfg |=EP_CFG_TDL_CHK ;break ;default :
fs/cifs/cifs_dfs_ref.c +3 -0
@@ -151,6 +151,9 @@ char *cifs_compose_mount_options(const char *sb_mountdata,return ERR_PTR (-EINVAL );if (ref) { +if (WARN_ON_ONCE (!ref->node_name || ref->path_consumed <0 )) +return ERR_PTR (-EINVAL ); +if (strlen (fullpath) - ref->path_consumed) { prepath = fullpath + ref->path_consumed;/* skip initial delimiter */
fs/f2fs/sysfs.c +4 -0
@@ -612,7 +612,9 @@ F2FS_FEATURE_RO_ATTR(lost_found, FEAT_LOST_FOUND);F2FS_FEATURE_RO_ATTR (verity,FEAT_VERITY );#endif F2FS_FEATURE_RO_ATTR (sb_checksum,FEAT_SB_CHECKSUM ); +#ifdef CONFIG_UNICODE F2FS_FEATURE_RO_ATTR (casefold,FEAT_CASEFOLD ); +#endif #ifdef CONFIG_F2FS_FS_COMPRESSION F2FS_FEATURE_RO_ATTR (compression,FEAT_COMPRESSION );#endif
@@ -700,7 +702,9 @@ static struct attribute *f2fs_feat_attrs[] = { ATTR_LIST(verity), #endif ATTR_LIST(sb_checksum), +#ifdef CONFIG_UNICODE ATTR_LIST(casefold), +#endif #ifdef CONFIG_F2FS_FS_COMPRESSION ATTR_LIST(compression),#endif
include/linux/bpf.h +1 -0
@@ -752,6 +752,7 @@ struct bpf_jit_poke_descriptor {void *tailcall_target;void *tailcall_bypass;void *bypass_addr; +void *aux; union { struct { struct bpf_map *map;
include/linux/huge_mm.h +1 -1
@@ -10,7 +10,7 @@vm_fault_t do_huge_pmd_anonymous_page (struct vm_fault *vmf);int copy_huge_pmd (struct mm_struct *dst_mm,struct mm_struct *src_mm,pmd_t *dst_pmd,pmd_t *src_pmd,unsigned long addr, -struct vm_area_struct *vma); +struct vm_area_struct *dst_vma,struct vm_area_struct *src_vma);void huge_pmd_set_accessed (struct vm_fault *vmf,pmd_t orig_pmd); int copy_huge_pud(struct mm_struct *dst_mm, struct mm_struct *src_mm, pud_t *dst_pud, pud_t *src_pud, unsigned long addr,
include/linux/swap.h +0 -9
@@ -503,15 +503,6 @@ static inline struct swap_info_struct *swp_swap_info(swp_entry_t entry)return NULL ; } -static inline struct swap_info_struct *get_swap_device (swp_entry_t entry) -{ -return NULL ; -} - -static inline void put_swap_device (struct swap_info_struct *si) -{ -} -#define swap_address_space (entry) (NULL)#define get_nr_swap_pages () 0L#define total_swap_pages 0L
include/linux/swapops.h +2 -0
@@ -265,6 +265,8 @@ static inline swp_entry_t pmd_to_swp_entry(pmd_t pmd)if (pmd_swp_soft_dirty (pmd)) pmd =pmd_swp_clear_soft_dirty (pmd); +if (pmd_swp_uffd_wp (pmd)) + pmd =pmd_swp_clear_uffd_wp (pmd); arch_entry =__pmd_to_swp_entry (pmd);return swp_entry (__swp_type (arch_entry),__swp_offset (arch_entry)); }
include/net/dst_metadata.h +3 -1
@@ -45,7 +45,9 @@ skb_tunnel_info(const struct sk_buff *skb)return &md_dst->u.tun_info; dst =skb_dst (skb); -if (dst && dst->lwtstate) +if (dst && dst->lwtstate && + (dst->lwtstate->type ==LWTUNNEL_ENCAP_IP || + dst->lwtstate->type ==LWTUNNEL_ENCAP_IP6 ))return lwt_tun_info (dst->lwtstate);return NULL ;
include/net/ip6_route.h +1 -1
@@ -262,7 +262,7 @@ static inline bool ipv6_anycast_destination(const struct dst_entry *dst,int ip6_fragment (struct net *net,struct sock *sk,struct sk_buff *skb,int (*output)(struct net *,struct sock *,struct sk_buff *)); -static inline int ip6_skb_dst_mtu (struct sk_buff *skb) +static inline unsigned int ip6_skb_dst_mtu (struct sk_buff *skb) {int mtu;
include/net/tcp.h +4 -0
@@ -676,6 +676,10 @@ static inline u32 __tcp_set_rto(const struct tcp_sock *tp)static inline void __tcp_fast_path_on (struct tcp_sock *tp,u32 snd_wnd) { +/* mptcp hooks are only on the slow path */ +if (sk_is_mptcp ((struct sock *)tp)) +return ; + tp->pred_flags =htonl ((tp->tcp_header_len <<26 ) |ntohl (TCP_FLAG_ACK ) | snd_wnd);
kernel/bpf/core.c +7 -1
@@ -2167,8 +2167,14 @@ static void bpf_prog_free_deferred(struct work_struct *work)#endif if (aux->dst_trampoline)bpf_trampoline_put (aux->dst_trampoline); -for (i =0 ; i < aux->func_cnt; i++) +for (i =0 ; i < aux->func_cnt; i++) { +/* We can just unlink the subprog poke descriptor table as +* it was originally linked to the main program and is also +* released along with it. +*/ + aux->func[i]->aux->poke_tab =NULL ;bpf_jit_free (aux->func[i]); + }if (aux->func_cnt) {kfree (aux->func);bpf_prog_unlock_free (aux->prog);
kernel/bpf/verifier.c +21 -39
86 lines not on this page · raw message
kernel/sched/fair.c +2 -2
@@ -5047,7 +5047,7 @@ static const u64 cfs_bandwidth_slack_period = 5 * NSEC_PER_MSEC;static int runtime_refresh_within (struct cfs_bandwidth *cfs_b,u64 min_expire) {struct hrtimer *refresh_timer = &cfs_b->period_timer; -u64 remaining; +s64 remaining;/* if the call-back is running a quota refresh is already occurring */ if (hrtimer_callback_running (refresh_timer))
@@ -5055,7 +5055,7 @@ static int runtime_refresh_within(struct cfs_bandwidth *cfs_b, u64 min_expire)/* is a quota refresh about to occur? */ remaining =ktime_to_ns (hrtimer_expires_remaining (refresh_timer)); -if (remaining < min_expire) +if (remaining < (s64 )min_expire)return 1 ;return 0 ;
mm/page_alloc.c +67 -39
106 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.