diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-24 08:46:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-24 08:46:03 -0700 |
| commit | cf9610f9116d55c5a66ef9f1faecacabd93a9322 (patch) | |
| tree | 757a3d280760c654767631cab5ad8af2d86d1848 /arch/sh/tools | |
| download | linux-stable-cf9610f9116d55c5a66ef9f1faecacabd93a9322.tar.gz linux-stable-cf9610f9116d55c5a66ef9f1faecacabd93a9322.zip | |
Merge tag 'pinctrl-v7.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrlgrafted
Pull pin control updates from Linus Walleij:
"Core changes:
- Use the non-blocking mux_state_try_select() in the generic MUX pin
control back-end
- Free pin maps on pinctrl_generic_to_map() failure in the core
helpers
New hardware pin control:
- Qualcomm Maili TLMM SoC, PMG1110 PMIC, and Eliza LPASS LPI TLMM SoC
(this is for the low power audio, LPASS = Low Power Audio SubSystem
portions)
- Upboard support on top of the Intel pin controller
- Apple T6030 and T6031 support (just compatible strings)
- Samsung Exynos 8855 SoC
- Mediatek MT6858 SoC
- Rockchip RK3308B and RV1106 SoCs
- Airoha EN7523 and AN7563 SoCs
Improvements:
- Qualcomm TLMM GPIOs are unconditionally marked as wakeup capable
- Qualcomm improvements on top of the Qualcomm PDC (power domain
controller) irqchip improvements from tglx:s tree
- Qualcomm IPQ806x and IPQ9650 non-urgent pin grop fixups
- The NPCM8xx driver has been put into shape fixing many pin and
group definitions
- Some non-urgent Tegra 264 pin assignments are fixed up
- Some non-urgent fixups to Airoha AN7581 and AN7583 registers and
pin assignments, missing features etc"
* tag 'pinctrl-v7.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (130 commits)
dt-bindings: pinctrl: Convert TI DA850 pupd to DT schema
pinctrl: meson: sync some modify from A4
pinctrl: meson: a4: Add input enable pin configuration
pinctrl: realtek: rtd1625: remove unused group name spdif_sel
pinctrl: realtek: rtd1625: fix base_bit for VE4 GPIO 13
dt-bindings: pinctrl: microchip,pic32mzda-pinctrl: Convert to DT schema
Revert "Merge branch 'ib-rsk7204' into devel"
pinctrl: rockchip: Add RV1106 pinctrl support
dt-bindings: pinctrl: rockchip: Add RV1106 compatible
pinctrl: rockchip: Decode drive strength in the get function
pinctrl: fix PINCTRL_GENERIC_MUX not always being selectable
pinctrl: airoha: add support of an7563 SoC
dt-bindings: pinctrl: airoha: add support of an7563 pin controller
pinctrl: airoha: try to find chip scu node by phandle first
pinctrl: airoha: add support of en7523 SoC
dt-bindings: pinctrl: airoha: add support of en7523 pin controller
pinctrl: airoha: an7583: add support for olt pinmux
pinctrl: airoha: an7583: add support for pon_alt pinmux
pinctrl: airoha: an7583: add support for npu_uart pinmux
dt-bindings: pinctrl: airoha: an7583: add missed features
...
Diffstat (limited to 'arch/sh/tools')
| -rw-r--r-- | arch/sh/tools/Makefile | 16 | ||||
| -rw-r--r-- | arch/sh/tools/gen-mach-types | 48 | ||||
| -rw-r--r-- | arch/sh/tools/mach-types | 67 |
3 files changed, 131 insertions, 0 deletions
diff --git a/arch/sh/tools/Makefile b/arch/sh/tools/Makefile new file mode 100644 index 000000000..e5ba31c79 --- /dev/null +++ b/arch/sh/tools/Makefile @@ -0,0 +1,16 @@ +# +# arch/sh/tools/Makefile +# +# Copyright (C) 2003 Paul Mundt +# +# This file is subject to the terms and conditions of the GNU General Public +# License. See the file "COPYING" in the main directory of this archive +# for more details. +# +# Shamelessly cloned from ARM. +# + +include/generated/machtypes.h: $(src)/gen-mach-types $(src)/mach-types + @echo ' Generating $@' + $(Q)mkdir -p $(dir $@) + $(Q)LC_ALL=C $(AWK) -f $^ > $@ diff --git a/arch/sh/tools/gen-mach-types b/arch/sh/tools/gen-mach-types new file mode 100644 index 000000000..6d7c2d8ea --- /dev/null +++ b/arch/sh/tools/gen-mach-types @@ -0,0 +1,48 @@ +#!/bin/awk +# SPDX-License-Identifier: GPL-2.0 +# +# Awk script to generate include/generated/machtypes.h +# Heavily based on arch/arm/tools/gen-mach-types +# +BEGIN { nr = 0 } +/^#/ { next } +/^[ ]*$/ { next } + +NF == 2 { + mach[nr] = $1; + config[nr] = "CONFIG_"$2; + nr++; + } + +END { + printf("/*\n"); + printf(" * Automagically generated, don't touch.\n"); + printf(" */\n"); + printf("#ifndef __ASM_SH_MACHTYPES_H\n"); + printf("#define __ASM_SH_MACHTYPES_H\n"); + printf("\n"); + printf("/*\n"); + printf(" * We'll use the following MACH_xxx defs for placeholders for the time\n"); + printf(" * being .. these will all go away once sh_machtype is assigned per-board.\n"); + printf(" *\n"); + printf(" * For now we leave things the way they are for backwards compatibility.\n"); + printf(" */\n"); + printf("\n"); + printf("/* Mach types */\n"); + + for (i = 0; i < nr; i++) { + printf("#ifdef %s\n", config[i]); + printf(" #define MACH_%s\t\t1\n", mach[i]); + printf("#else\n"); + printf(" #define MACH_%s\t\t0\n", mach[i]); + printf("#endif\n"); + } + + printf("\n"); + printf("/* Machtype checks */\n"); + for (i = 0; i < nr; i++) + printf("#define mach_is_%s()\t\t\t(MACH_%s)\n", + tolower(mach[i]), mach[i]); + printf("\n"); + printf("#endif /* __ASM_SH_MACHTYPES_H */\n"); + } diff --git a/arch/sh/tools/mach-types b/arch/sh/tools/mach-types new file mode 100644 index 000000000..29e648855 --- /dev/null +++ b/arch/sh/tools/mach-types @@ -0,0 +1,67 @@ +# +# MACH_<xxx> CONFIG_<xxx> +# + +# +# List of board groups. +# +SE SH_SOLUTION_ENGINE +HIGHLANDER SH_HIGHLANDER +RTS7751R2D SH_RTS7751R2D +RSK SH_RSK +ALPHA_BOARD SH_ALPHA_BOARD + +# +# List of companion chips / MFDs. +# +HD64461 HD64461 + +# +# List of boards. +# +7206SE SH_7206_SOLUTION_ENGINE +7343SE SH_7343_SOLUTION_ENGINE +7619SE SH_7619_SOLUTION_ENGINE +7721SE SH_7721_SOLUTION_ENGINE +7722SE SH_7722_SOLUTION_ENGINE +7724SE SH_7724_SOLUTION_ENGINE +7751SE SH_7751_SOLUTION_ENGINE +7780SE SH_7780_SOLUTION_ENGINE +HP6XX SH_HP6XX +DREAMCAST SH_DREAMCAST +SNAPGEAR SH_SECUREEDGE5410 +EDOSK7705 SH_EDOSK7705 +EDOSK7760 SH_EDOSK7760 +SDK7786 SH_SDK7786 +SH4202_MICRODEV SH_SH4202_MICRODEV +SH03 SH_SH03 +LANDISK SH_LANDISK +R7780RP SH_R7780RP +R7780MP SH_R7780MP +R7785RP SH_R7785RP +TITAN SH_TITAN +SHMIN SH_SHMIN +LBOXRE2 SH_LBOX_RE2 +X3PROTO SH_X3PROTO +MAGICPANELR2 SH_MAGIC_PANEL_R2 +R2D_PLUS RTS7751R2D_PLUS +R2D_1 RTS7751R2D_1 +SDK7780 SH_SDK7780 +MIGOR SH_MIGOR +RSK7201 SH_RSK7201 +RSK7203 SH_RSK7203 +RSK7264 SH_RSK7264 +RSK7269 SH_RSK7269 +AP325RXA SH_AP325RXA +SH2007 SH_SH2007 +SH7757LCR SH_SH7757LCR +SH7763RDP SH_SH7763RDP +SH7785LCR SH_SH7785LCR +SH7785LCR_PT SH_SH7785LCR_PT +URQUELL SH_URQUELL +ESPT SH_ESPT +POLARIS SH_POLARIS +KFR2R09 SH_KFR2R09 +ECOVEC SH_ECOVEC +APSH4A3A SH_APSH4A3A +APSH4AD0A SH_APSH4AD0A |
