Pull ARM SoC fixes from Olof Johansson: "I didn't get a batch in this weekend, so here's what we queued up last week and today. - A couple of defconfigs add back debugfs -- it used to be implicitly enabled through CONFIG_TRACING, but 0e4a459f56c32d3e ("tracing: Remove unnecessary DEBUG_FS dependency") removed that. - The rest are mostly minor fixlets of the usual kind; some DT tweaks, a headerfile refactor that needs a build fix now, etc" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (30 commits) ARM: bcm: Add missing sentinel to bcm2711_compat[] ARM: shmobile: defconfig: Restore debugfs support bus: ti-sysc: Fix missing reset delay handling ARM: imx: Fix boot crash if ocotp is not found ARM: imx_v6_v7_defconfig: Explicitly restore CONFIG_DEBUG_FS ARM: dts: imx6ul-evk: Fix peripheral regulator arm64: dts: ls1028a: fix reboot node ARM: mmp: include the correct cputype.h ARM: dts: am437x-gp/epos-evm: fix panel compatible arm64: dts: ls1028a: fix typo in TMU calibration data ARM: imx: Correct ocotp id for serial number support of i.MX6ULL/ULZ SoCs ARM: dts: bcm283x: Fix critical trip point ARM: omap2plus_defconfig: Add back DEBUG_FS ARM: omap2plus_defconfig: enable NET_SWITCHDEV ARM: dts: am335x-sancloud-bbe: fix phy mode bus: ti-sysc: Fix missing force mstandby quirk handling reset: Do not register resource data for missing resets reset: Fix {of,devm}_reset_control_array_get kerneldoc return types reset: brcmstb: Remove resource checks dt-bindings: reset: Fix brcmstb-reset example ...
Showing the changes to include/linux (1 of 26 files). Show all
Unified · Split
| @@ -49,6 +49,7 @@ struct sysc_regbits { · 48 unmodified lines | |||
| 49 | s8 emufree_shift; | 49 | s8 emufree_shift; |
| 50 | }; | 50 | }; |
| 51 | 51 | ||
| 52 | #define SYSC_QUIRK_FORCE_MSTANDBY BIT(20) | ||
| 52 | #define SYSC_MODULE_QUIRK_AESS BIT(19) | 53 | #define SYSC_MODULE_QUIRK_AESS BIT(19) |
| 53 | #define SYSC_MODULE_QUIRK_SGX BIT(18) | 54 | #define SYSC_MODULE_QUIRK_SGX BIT(18) |
| 54 | #define SYSC_MODULE_QUIRK_HDQ1W BIT(17) | 55 | #define SYSC_MODULE_QUIRK_HDQ1W BIT(17) |