sugar/linux
1
0
Fork 0
Code Activity

Merge tag 'intel-pinctrl-v6.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel into devel

Browse Source 
intel-pinctrl for v6.13-2

This includes following Intel pinctrl changes for v6.13 merge window:

  - Expose DSW community on Elkhart Lake.
  - Elaborate in the code comment the pull bias settings.

Both have been in linux-next with no reported issues.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij
2024-11-07 14:56:52 +01:00
parent f52f40b22e c6235c426d
commit 546ee7b890
2 changed files with 50 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/pinctrl/intel/pinctrl-elkhartlake.c
View File

@@ -264,6 +264,43 @@ static const struct intel_pinctrl_soc_data ehl_community1_soc_data = {
.ncommunities = ARRAY_SIZE(ehl_community1),
};
static const struct pinctrl_pin_desc ehl_community2_pins[] = {
/* DSW */
PINCTRL_PIN(0, "BATLOWB"),
PINCTRL_PIN(1, "ACPRESENT"),
PINCTRL_PIN(2, "LAN_WAKEB"),
PINCTRL_PIN(3, "PWRBTNB"),
PINCTRL_PIN(4, "SLP_S3B"),
PINCTRL_PIN(5, "SLP_S4B"),
PINCTRL_PIN(6, "SLP_AB"),
PINCTRL_PIN(7, "GPD_7"),
PINCTRL_PIN(8, "SUSCLK"),
PINCTRL_PIN(9, "SLP_WLANB"),
PINCTRL_PIN(10, "SLP_S5B"),
PINCTRL_PIN(11, "LANPHYPC"),
PINCTRL_PIN(12, "INPUT3VSEL"),
PINCTRL_PIN(13, "SLP_LANB"),
PINCTRL_PIN(14, "SLP_SUSB"),
PINCTRL_PIN(15, "WAKEB"),
PINCTRL_PIN(16, "DRAM_RESETB"),
};
static const struct intel_padgroup ehl_community2_gpps[] = {
EHL_GPP(0, 0, 16), /* DSW */
};
static const struct intel_community ehl_community2[] = {
EHL_COMMUNITY(0, 0, 16, ehl_community2_gpps),
};
static const struct intel_pinctrl_soc_data ehl_community2_soc_data = {
.uid = "2",
.pins = ehl_community2_pins,
.npins = ARRAY_SIZE(ehl_community2_pins),
.communities = ehl_community2,
.ncommunities = ARRAY_SIZE(ehl_community2),
};
static const struct pinctrl_pin_desc ehl_community3_pins[] = {
/* CPU */
PINCTRL_PIN(0, "HDACPU_SDI"),
@@ -474,6 +511,7 @@ static const struct intel_pinctrl_soc_data ehl_community5_soc_data = {
static const struct intel_pinctrl_soc_data *ehl_soc_data_array[] = {
&ehl_community0_soc_data,
&ehl_community1_soc_data,
&ehl_community2_soc_data,
&ehl_community3_soc_data,
&ehl_community4_soc_data,
&ehl_community5_soc_data,

12
drivers/pinctrl/intel/pinctrl-intel.c
View File

@@ -85,6 +85,18 @@
#define PADCFG1_TERM_UP BIT(13)
#define PADCFG1_TERM_SHIFT 10
#define PADCFG1_TERM_MASK GENMASK(12, 10)
/*
* Bit 0 Bit 1 Bit 2 Value, Ohms
*
* 0 0 0 -
* 0 0 1 20000
* 0 1 0 5000
* 0 1 1 ~4000
* 1 0 0 1000 (if supported)
* 1 0 1 ~952 (if supported)
* 1 1 0 ~833 (if supported)
* 1 1 1 ~800 (if supported)
*/
#define PADCFG1_TERM_20K BIT(2)
#define PADCFG1_TERM_5K BIT(1)
#define PADCFG1_TERM_4K (BIT(2) | BIT(1))