forked from Minki/linux
Pin control fixes for the v5.10 series:
- Two fixes to the Intel pin controller drivers: fixing
pull resistance bias.
- Fix some invalid SSI pins on the Ingenic pin controller.
- Make sure the clock is enabled when requesting interrupts
from the Rockchip GPIO controller.
- Make sure IRQs are mapped when looking up the IRQ for
a GPIO line on the Rockchip GPIO Write.
- Two regmap initialization fixes for the MCP23s08.
- Fix a GPI-only prefix function problem on the Aspeed pin
controller.
- Disable the debounce filter correctly on the AMD
pin controller.
- Correct the timer clock setting for the AMD debounce
timer.
- Make the Qualcomm pin controller more cautious around the
handling of PDC-related GPIO interrupts.
- Fix the interrupt map in the Qualcomm SM8250 pin controller.
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEElDRnuGcz/wPCXQWMQRCzN7AZXXMFAl+uh50ACgkQQRCzN7AZ
XXNp2A/8CeX/RZ/Or7uPNTcZ3SMCuSh30iSctu7dZHBKqxQZyNpJ8DYMkUP0w2+b
snK50zU1LNSVj4rh396/qeI7QcO/gPslhohuoTbXvJC6Z1OOLlpyIkVn596uLaYE
/+fD1sslGxcTpBOZ/yOoyBeVbhh4X+Pq1+svxdGm493RyXi2Tj5mVnnfC9l7sXnK
WVkYcvXNd2tW7FspK1XDvVMwAy+5tRczKXKvGeQELg3esgGgTEKGTcO5NwLsLOKC
Q8Kz/wvEpC/nvqbHTPBc24AYrGD6mGE1a0iZRD6lFHaqzNO2CxQN7vPX1kfijcuS
Fr/naWre8kw+VxlEBamWclp0d5fjOnPfexn6IUsSVJSl8T73M4c5DPaqxgZrwmUx
PGAPJCBPnaTAIOoK9CBIS8fa3mXItlwaTXOYAjsQtYYMptcoKXncWo3RU1zZXiSw
E/5Q6nxH2yb9oobOz1yHmpMPxhLV490McUwC2sW5VxzTJVIXTDmOOOop2ck1IIRF
NXVEfsRuQPHaOQbXClUgr/KkRu7RRKigov7tJiMQy8wZZiM+jP8gbLv/1g7cnAum
KrIo3oks0matYeBdgbkwS4gf4PloDw0CAqIONawT76XlDx0kmLiSk0ie4oa12npu
BIP+iG4MBk9P3QkwMcbQ3aN5dlI3C2nNKRshlKFFBl4m83ebcpI=
=HNAI
-----END PGP SIGNATURE-----
Merge tag 'pinctrl-v5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pin control fixes from Linus Walleij:
"A bunch of pin control fixes for the v5.10 kernel series.
Nothing in particular to say about it, because they are all driver
fixes.
I'm happy that some AMD driver fixes are appearing, it's been an
undermaintained driver, and laptops have suffered.
Summary:
- Two fixes to the Intel pin controller drivers: fixing pull
resistance bias.
- Fix some invalid SSI pins on the Ingenic pin controller.
- Make sure the clock is enabled when requesting interrupts from the
Rockchip GPIO controller.
- Make sure IRQs are mapped when looking up the IRQ for a GPIO line
on the Rockchip GPIO Write.
- Two regmap initialization fixes for the MCP23s08.
- Fix a GPI-only prefix function problem on the Aspeed pin
controller.
- Disable the debounce filter correctly on the AMD pin controller.
- Correct the timer clock setting for the AMD debounce timer.
- Make the Qualcomm pin controller more cautious around the handling
of PDC-related GPIO interrupts.
- Fix the interrupt map in the Qualcomm SM8250 pin controller"
* tag 'pinctrl-v5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
pinctrl: qcom: sm8250: Specify PDC map
pinctrl: qcom: Move clearing pending IRQ to .irq_request_resources callback
pinctrl: amd: use higher precision for 512 RtcClk
pinctrl: amd: fix incorrect way to disable debounce filter
pinctrl: aspeed: Fix GPI only function problem.
pinctrl: mcp23s08: Print error message when regmap init fails
pinctrl: mcp23s08: Use full chunk of memory for regmap configuration
pinctrl: rockchip: create irq mapping in gpio_to_irq
pinctrl: rockchip: enable gpio pclk for rockchip_gpio_to_irq
pinctrl: ingenic: Fix invalid SSI pins
pinctrl: intel: Set default bias in case no particular value given
pinctrl: intel: Fix 2 kOhm bias which is 833 Ohm
This commit is contained in:
Linus Torvalds
commit
4de010e2c9
@ -286,13 +286,14 @@ int aspeed_pinmux_set_mux(struct pinctrl_dev *pctldev, unsigned int function,
|
||||
static bool aspeed_expr_is_gpio(const struct aspeed_sig_expr *expr)
|
||||
{
|
||||
/*
|
||||
* The signal type is GPIO if the signal name has "GPIO" as a prefix.
|
||||
* The signal type is GPIO if the signal name has "GPI" as a prefix.
|
||||
* strncmp (rather than strcmp) is used to implement the prefix
|
||||
* requirement.
|
||||
*
|
||||
* expr->signal might look like "GPIOT3" in the GPIO case.
|
||||
* expr->signal might look like "GPIOB1" in the GPIO case.
|
||||
* expr->signal might look like "GPIT0" in the GPI case.
|
||||
*/
|
||||
return strncmp(expr->signal, "GPIO", 4) == 0;
|
||||
return strncmp(expr->signal, "GPI", 3) == 0;
|
||||
}
|
||||
|
||||
static bool aspeed_gpio_in_exprs(const struct aspeed_sig_expr **exprs)
|
||||
|
||||
@ -62,10 +62,10 @@
|
||||
#define PADCFG1_TERM_UP BIT(13)
|
||||
#define PADCFG1_TERM_SHIFT 10
|
||||
#define PADCFG1_TERM_MASK GENMASK(12, 10)
|
||||
#define PADCFG1_TERM_20K 4
|
||||
#define PADCFG1_TERM_2K 3
|
||||
#define PADCFG1_TERM_5K 2
|
||||
#define PADCFG1_TERM_1K 1
|
||||
#define PADCFG1_TERM_20K BIT(2)
|
||||
#define PADCFG1_TERM_5K BIT(1)
|
||||
#define PADCFG1_TERM_1K BIT(0)
|
||||
#define PADCFG1_TERM_833 (BIT(1) | BIT(0))
|
||||
|
||||
#define PADCFG2 0x008
|
||||
#define PADCFG2_DEBEN BIT(0)
|
||||
@ -549,12 +549,12 @@ static int intel_config_get_pull(struct intel_pinctrl *pctrl, unsigned int pin,
|
||||
return -EINVAL;
|
||||
|
||||
switch (term) {
|
||||
case PADCFG1_TERM_833:
|
||||
*arg = 833;
|
||||
break;
|
||||
case PADCFG1_TERM_1K:
|
||||
*arg = 1000;
|
||||
break;
|
||||
case PADCFG1_TERM_2K:
|
||||
*arg = 2000;
|
||||
break;
|
||||
case PADCFG1_TERM_5K:
|
||||
*arg = 5000;
|
||||
break;
|
||||
@ -570,6 +570,11 @@ static int intel_config_get_pull(struct intel_pinctrl *pctrl, unsigned int pin,
|
||||
return -EINVAL;
|
||||
|
||||
switch (term) {
|
||||
case PADCFG1_TERM_833:
|
||||
if (!(community->features & PINCTRL_FEATURE_1K_PD))
|
||||
return -EINVAL;
|
||||
*arg = 833;
|
||||
break;
|
||||
case PADCFG1_TERM_1K:
|
||||
if (!(community->features & PINCTRL_FEATURE_1K_PD))
|
||||
return -EINVAL;
|
||||
@ -678,6 +683,10 @@ static int intel_config_set_pull(struct intel_pinctrl *pctrl, unsigned int pin,
|
||||
|
||||
value |= PADCFG1_TERM_UP;
|
||||
|
||||
/* Set default strength value in case none is given */
|
||||
if (arg == 1)
|
||||
arg = 5000;
|
||||
|
||||
switch (arg) {
|
||||
case 20000:
|
||||
value |= PADCFG1_TERM_20K << PADCFG1_TERM_SHIFT;
|
||||
@ -685,12 +694,12 @@ static int intel_config_set_pull(struct intel_pinctrl *pctrl, unsigned int pin,
|
||||
case 5000:
|
||||
value |= PADCFG1_TERM_5K << PADCFG1_TERM_SHIFT;
|
||||
break;
|
||||
case 2000:
|
||||
value |= PADCFG1_TERM_2K << PADCFG1_TERM_SHIFT;
|
||||
break;
|
||||
case 1000:
|
||||
value |= PADCFG1_TERM_1K << PADCFG1_TERM_SHIFT;
|
||||
break;
|
||||
case 833:
|
||||
value |= PADCFG1_TERM_833 << PADCFG1_TERM_SHIFT;
|
||||
break;
|
||||
default:
|
||||
ret = -EINVAL;
|
||||
}
|
||||
@ -700,6 +709,10 @@ static int intel_config_set_pull(struct intel_pinctrl *pctrl, unsigned int pin,
|
||||
case PIN_CONFIG_BIAS_PULL_DOWN:
|
||||
value &= ~(PADCFG1_TERM_UP | PADCFG1_TERM_MASK);
|
||||
|
||||
/* Set default strength value in case none is given */
|
||||
if (arg == 1)
|
||||
arg = 5000;
|
||||
|
||||
switch (arg) {
|
||||
case 20000:
|
||||
value |= PADCFG1_TERM_20K << PADCFG1_TERM_SHIFT;
|
||||
@ -714,6 +727,13 @@ static int intel_config_set_pull(struct intel_pinctrl *pctrl, unsigned int pin,
|
||||
}
|
||||
value |= PADCFG1_TERM_1K << PADCFG1_TERM_SHIFT;
|
||||
break;
|
||||
case 833:
|
||||
if (!(community->features & PINCTRL_FEATURE_1K_PD)) {
|
||||
ret = -EINVAL;
|
||||
break;
|
||||
}
|
||||
value |= PADCFG1_TERM_833 << PADCFG1_TERM_SHIFT;
|
||||
break;
|
||||
default:
|
||||
ret = -EINVAL;
|
||||
}
|
||||
|
||||
@ -156,7 +156,7 @@ static int amd_gpio_set_debounce(struct gpio_chip *gc, unsigned offset,
|
||||
pin_reg |= BIT(DB_TMR_OUT_UNIT_OFF);
|
||||
pin_reg &= ~BIT(DB_TMR_LARGE_OFF);
|
||||
} else if (debounce < 250000) {
|
||||
time = debounce / 15600;
|
||||
time = debounce / 15625;
|
||||
pin_reg |= time & DB_TMR_OUT_MASK;
|
||||
pin_reg &= ~BIT(DB_TMR_OUT_UNIT_OFF);
|
||||
pin_reg |= BIT(DB_TMR_LARGE_OFF);
|
||||
@ -166,14 +166,14 @@ static int amd_gpio_set_debounce(struct gpio_chip *gc, unsigned offset,
|
||||
pin_reg |= BIT(DB_TMR_OUT_UNIT_OFF);
|
||||
pin_reg |= BIT(DB_TMR_LARGE_OFF);
|
||||
} else {
|
||||
pin_reg &= ~DB_CNTRl_MASK;
|
||||
pin_reg &= ~(DB_CNTRl_MASK << DB_CNTRL_OFF);
|
||||
ret = -EINVAL;
|
||||
}
|
||||
} else {
|
||||
pin_reg &= ~BIT(DB_TMR_OUT_UNIT_OFF);
|
||||
pin_reg &= ~BIT(DB_TMR_LARGE_OFF);
|
||||
pin_reg &= ~DB_TMR_OUT_MASK;
|
||||
pin_reg &= ~DB_CNTRl_MASK;
|
||||
pin_reg &= ~(DB_CNTRl_MASK << DB_CNTRL_OFF);
|
||||
}
|
||||
writel(pin_reg, gpio_dev->base + offset * 4);
|
||||
raw_spin_unlock_irqrestore(&gpio_dev->lock, flags);
|
||||
|
||||
@ -635,44 +635,44 @@ static int jz4770_uart3_data_pins[] = { 0x6c, 0x85, };
|
||||
static int jz4770_uart3_hwflow_pins[] = { 0x88, 0x89, };
|
||||
static int jz4770_ssi0_dt_a_pins[] = { 0x15, };
|
||||
static int jz4770_ssi0_dt_b_pins[] = { 0x35, };
|
||||
static int jz4770_ssi0_dt_d_pins[] = { 0x55, };
|
||||
static int jz4770_ssi0_dt_e_pins[] = { 0x71, };
|
||||
static int jz4770_ssi0_dt_d_pins[] = { 0x75, };
|
||||
static int jz4770_ssi0_dt_e_pins[] = { 0x91, };
|
||||
static int jz4770_ssi0_dr_a_pins[] = { 0x14, };
|
||||
static int jz4770_ssi0_dr_b_pins[] = { 0x34, };
|
||||
static int jz4770_ssi0_dr_d_pins[] = { 0x54, };
|
||||
static int jz4770_ssi0_dr_e_pins[] = { 0x6e, };
|
||||
static int jz4770_ssi0_dr_d_pins[] = { 0x74, };
|
||||
static int jz4770_ssi0_dr_e_pins[] = { 0x8e, };
|
||||
static int jz4770_ssi0_clk_a_pins[] = { 0x12, };
|
||||
static int jz4770_ssi0_clk_b_pins[] = { 0x3c, };
|
||||
static int jz4770_ssi0_clk_d_pins[] = { 0x58, };
|
||||
static int jz4770_ssi0_clk_e_pins[] = { 0x6f, };
|
||||
static int jz4770_ssi0_clk_d_pins[] = { 0x78, };
|
||||
static int jz4770_ssi0_clk_e_pins[] = { 0x8f, };
|
||||
static int jz4770_ssi0_gpc_b_pins[] = { 0x3e, };
|
||||
static int jz4770_ssi0_gpc_d_pins[] = { 0x56, };
|
||||
static int jz4770_ssi0_gpc_e_pins[] = { 0x73, };
|
||||
static int jz4770_ssi0_gpc_d_pins[] = { 0x76, };
|
||||
static int jz4770_ssi0_gpc_e_pins[] = { 0x93, };
|
||||
static int jz4770_ssi0_ce0_a_pins[] = { 0x13, };
|
||||
static int jz4770_ssi0_ce0_b_pins[] = { 0x3d, };
|
||||
static int jz4770_ssi0_ce0_d_pins[] = { 0x59, };
|
||||
static int jz4770_ssi0_ce0_e_pins[] = { 0x70, };
|
||||
static int jz4770_ssi0_ce0_d_pins[] = { 0x79, };
|
||||
static int jz4770_ssi0_ce0_e_pins[] = { 0x90, };
|
||||
static int jz4770_ssi0_ce1_b_pins[] = { 0x3f, };
|
||||
static int jz4770_ssi0_ce1_d_pins[] = { 0x57, };
|
||||
static int jz4770_ssi0_ce1_e_pins[] = { 0x72, };
|
||||
static int jz4770_ssi0_ce1_d_pins[] = { 0x77, };
|
||||
static int jz4770_ssi0_ce1_e_pins[] = { 0x92, };
|
||||
static int jz4770_ssi1_dt_b_pins[] = { 0x35, };
|
||||
static int jz4770_ssi1_dt_d_pins[] = { 0x55, };
|
||||
static int jz4770_ssi1_dt_e_pins[] = { 0x71, };
|
||||
static int jz4770_ssi1_dt_d_pins[] = { 0x75, };
|
||||
static int jz4770_ssi1_dt_e_pins[] = { 0x91, };
|
||||
static int jz4770_ssi1_dr_b_pins[] = { 0x34, };
|
||||
static int jz4770_ssi1_dr_d_pins[] = { 0x54, };
|
||||
static int jz4770_ssi1_dr_e_pins[] = { 0x6e, };
|
||||
static int jz4770_ssi1_dr_d_pins[] = { 0x74, };
|
||||
static int jz4770_ssi1_dr_e_pins[] = { 0x8e, };
|
||||
static int jz4770_ssi1_clk_b_pins[] = { 0x3c, };
|
||||
static int jz4770_ssi1_clk_d_pins[] = { 0x58, };
|
||||
static int jz4770_ssi1_clk_e_pins[] = { 0x6f, };
|
||||
static int jz4770_ssi1_clk_d_pins[] = { 0x78, };
|
||||
static int jz4770_ssi1_clk_e_pins[] = { 0x8f, };
|
||||
static int jz4770_ssi1_gpc_b_pins[] = { 0x3e, };
|
||||
static int jz4770_ssi1_gpc_d_pins[] = { 0x56, };
|
||||
static int jz4770_ssi1_gpc_e_pins[] = { 0x73, };
|
||||
static int jz4770_ssi1_gpc_d_pins[] = { 0x76, };
|
||||
static int jz4770_ssi1_gpc_e_pins[] = { 0x93, };
|
||||
static int jz4770_ssi1_ce0_b_pins[] = { 0x3d, };
|
||||
static int jz4770_ssi1_ce0_d_pins[] = { 0x59, };
|
||||
static int jz4770_ssi1_ce0_e_pins[] = { 0x70, };
|
||||
static int jz4770_ssi1_ce0_d_pins[] = { 0x79, };
|
||||
static int jz4770_ssi1_ce0_e_pins[] = { 0x90, };
|
||||
static int jz4770_ssi1_ce1_b_pins[] = { 0x3f, };
|
||||
static int jz4770_ssi1_ce1_d_pins[] = { 0x57, };
|
||||
static int jz4770_ssi1_ce1_e_pins[] = { 0x72, };
|
||||
static int jz4770_ssi1_ce1_d_pins[] = { 0x77, };
|
||||
static int jz4770_ssi1_ce1_e_pins[] = { 0x92, };
|
||||
static int jz4770_mmc0_1bit_a_pins[] = { 0x12, 0x13, 0x14, };
|
||||
static int jz4770_mmc0_4bit_a_pins[] = { 0x15, 0x16, 0x17, };
|
||||
static int jz4770_mmc0_1bit_e_pins[] = { 0x9c, 0x9d, 0x94, };
|
||||
@ -1050,35 +1050,35 @@ static int jz4780_ssi0_dt_a_19_pins[] = { 0x13, };
|
||||
static int jz4780_ssi0_dt_a_21_pins[] = { 0x15, };
|
||||
static int jz4780_ssi0_dt_a_28_pins[] = { 0x1c, };
|
||||
static int jz4780_ssi0_dt_b_pins[] = { 0x3d, };
|
||||
static int jz4780_ssi0_dt_d_pins[] = { 0x59, };
|
||||
static int jz4780_ssi0_dt_d_pins[] = { 0x79, };
|
||||
static int jz4780_ssi0_dr_a_20_pins[] = { 0x14, };
|
||||
static int jz4780_ssi0_dr_a_27_pins[] = { 0x1b, };
|
||||
static int jz4780_ssi0_dr_b_pins[] = { 0x34, };
|
||||
static int jz4780_ssi0_dr_d_pins[] = { 0x54, };
|
||||
static int jz4780_ssi0_dr_d_pins[] = { 0x74, };
|
||||
static int jz4780_ssi0_clk_a_pins[] = { 0x12, };
|
||||
static int jz4780_ssi0_clk_b_5_pins[] = { 0x25, };
|
||||
static int jz4780_ssi0_clk_b_28_pins[] = { 0x3c, };
|
||||
static int jz4780_ssi0_clk_d_pins[] = { 0x58, };
|
||||
static int jz4780_ssi0_clk_d_pins[] = { 0x78, };
|
||||
static int jz4780_ssi0_gpc_b_pins[] = { 0x3e, };
|
||||
static int jz4780_ssi0_gpc_d_pins[] = { 0x56, };
|
||||
static int jz4780_ssi0_gpc_d_pins[] = { 0x76, };
|
||||
static int jz4780_ssi0_ce0_a_23_pins[] = { 0x17, };
|
||||
static int jz4780_ssi0_ce0_a_25_pins[] = { 0x19, };
|
||||
static int jz4780_ssi0_ce0_b_pins[] = { 0x3f, };
|
||||
static int jz4780_ssi0_ce0_d_pins[] = { 0x57, };
|
||||
static int jz4780_ssi0_ce0_d_pins[] = { 0x77, };
|
||||
static int jz4780_ssi0_ce1_b_pins[] = { 0x35, };
|
||||
static int jz4780_ssi0_ce1_d_pins[] = { 0x55, };
|
||||
static int jz4780_ssi0_ce1_d_pins[] = { 0x75, };
|
||||
static int jz4780_ssi1_dt_b_pins[] = { 0x3d, };
|
||||
static int jz4780_ssi1_dt_d_pins[] = { 0x59, };
|
||||
static int jz4780_ssi1_dt_d_pins[] = { 0x79, };
|
||||
static int jz4780_ssi1_dr_b_pins[] = { 0x34, };
|
||||
static int jz4780_ssi1_dr_d_pins[] = { 0x54, };
|
||||
static int jz4780_ssi1_dr_d_pins[] = { 0x74, };
|
||||
static int jz4780_ssi1_clk_b_pins[] = { 0x3c, };
|
||||
static int jz4780_ssi1_clk_d_pins[] = { 0x58, };
|
||||
static int jz4780_ssi1_clk_d_pins[] = { 0x78, };
|
||||
static int jz4780_ssi1_gpc_b_pins[] = { 0x3e, };
|
||||
static int jz4780_ssi1_gpc_d_pins[] = { 0x56, };
|
||||
static int jz4780_ssi1_gpc_d_pins[] = { 0x76, };
|
||||
static int jz4780_ssi1_ce0_b_pins[] = { 0x3f, };
|
||||
static int jz4780_ssi1_ce0_d_pins[] = { 0x57, };
|
||||
static int jz4780_ssi1_ce0_d_pins[] = { 0x77, };
|
||||
static int jz4780_ssi1_ce1_b_pins[] = { 0x35, };
|
||||
static int jz4780_ssi1_ce1_d_pins[] = { 0x55, };
|
||||
static int jz4780_ssi1_ce1_d_pins[] = { 0x75, };
|
||||
static int jz4780_mmc0_8bit_a_pins[] = { 0x04, 0x05, 0x06, 0x07, 0x18, };
|
||||
static int jz4780_i2c3_pins[] = { 0x6a, 0x6b, };
|
||||
static int jz4780_i2c4_e_pins[] = { 0x8c, 0x8d, };
|
||||
|
||||
@ -119,13 +119,15 @@ static int mcp23s08_spi_regmap_init(struct mcp23s08 *mcp, struct device *dev,
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
copy = devm_kmemdup(dev, &config, sizeof(config), GFP_KERNEL);
|
||||
copy = devm_kmemdup(dev, config, sizeof(*config), GFP_KERNEL);
|
||||
if (!copy)
|
||||
return -ENOMEM;
|
||||
|
||||
copy->name = name;
|
||||
|
||||
mcp->regmap = devm_regmap_init(dev, &mcp23sxx_spi_regmap, mcp, copy);
|
||||
if (IS_ERR(mcp->regmap))
|
||||
dev_err(dev, "regmap init failed for %s\n", mcp->chip.label);
|
||||
return PTR_ERR_OR_ZERO(mcp->regmap);
|
||||
}
|
||||
|
||||
|
||||
@ -3155,7 +3155,9 @@ static int rockchip_gpio_to_irq(struct gpio_chip *gc, unsigned offset)
|
||||
if (!bank->domain)
|
||||
return -ENXIO;
|
||||
|
||||
clk_enable(bank->clk);
|
||||
virq = irq_create_mapping(bank->domain, offset);
|
||||
clk_disable(bank->clk);
|
||||
|
||||
return (virq) ? : -ENXIO;
|
||||
}
|
||||
@ -3194,7 +3196,7 @@ static void rockchip_irq_demux(struct irq_desc *desc)
|
||||
|
||||
irq = __ffs(pend);
|
||||
pend &= ~BIT(irq);
|
||||
virq = irq_linear_revmap(bank->domain, irq);
|
||||
virq = irq_find_mapping(bank->domain, irq);
|
||||
|
||||
if (!virq) {
|
||||
dev_err(bank->drvdata->dev, "unmapped irq %d\n", irq);
|
||||
@ -3373,7 +3375,7 @@ static int rockchip_interrupts_register(struct platform_device *pdev,
|
||||
unsigned int clr = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN;
|
||||
struct irq_chip_generic *gc;
|
||||
int ret;
|
||||
int i, j;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < ctrl->nr_banks; ++i, ++bank) {
|
||||
if (!bank->valid) {
|
||||
@ -3400,7 +3402,7 @@ static int rockchip_interrupts_register(struct platform_device *pdev,
|
||||
|
||||
ret = irq_alloc_domain_generic_chips(bank->domain, 32, 1,
|
||||
"rockchip_gpio_irq", handle_level_irq,
|
||||
clr, 0, IRQ_GC_INIT_MASK_CACHE);
|
||||
clr, 0, 0);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "could not alloc generic chips for bank %s\n",
|
||||
bank->name);
|
||||
@ -3409,14 +3411,6 @@ static int rockchip_interrupts_register(struct platform_device *pdev,
|
||||
continue;
|
||||
}
|
||||
|
||||
/*
|
||||
* Linux assumes that all interrupts start out disabled/masked.
|
||||
* Our driver only uses the concept of masked and always keeps
|
||||
* things enabled, so for us that's all masked and all enabled.
|
||||
*/
|
||||
writel_relaxed(0xffffffff, bank->reg_base + GPIO_INTMASK);
|
||||
writel_relaxed(0xffffffff, bank->reg_base + GPIO_INTEN);
|
||||
|
||||
gc = irq_get_domain_generic_chip(bank->domain, 0);
|
||||
gc->reg_base = bank->reg_base;
|
||||
gc->private = bank;
|
||||
@ -3433,13 +3427,17 @@ static int rockchip_interrupts_register(struct platform_device *pdev,
|
||||
gc->chip_types[0].chip.irq_set_type = rockchip_irq_set_type;
|
||||
gc->wake_enabled = IRQ_MSK(bank->nr_pins);
|
||||
|
||||
/*
|
||||
* Linux assumes that all interrupts start out disabled/masked.
|
||||
* Our driver only uses the concept of masked and always keeps
|
||||
* things enabled, so for us that's all masked and all enabled.
|
||||
*/
|
||||
writel_relaxed(0xffffffff, bank->reg_base + GPIO_INTMASK);
|
||||
writel_relaxed(0xffffffff, bank->reg_base + GPIO_INTEN);
|
||||
gc->mask_cache = 0xffffffff;
|
||||
|
||||
irq_set_chained_handler_and_data(bank->irq,
|
||||
rockchip_irq_demux, bank);
|
||||
|
||||
/* map the gpio irqs here, when the clock is still running */
|
||||
for (j = 0 ; j < 32 ; j++)
|
||||
irq_create_mapping(bank->domain, j);
|
||||
|
||||
clk_disable(bank->clk);
|
||||
}
|
||||
|
||||
|
||||
@ -815,21 +815,14 @@ static void msm_gpio_irq_clear_unmask(struct irq_data *d, bool status_clear)
|
||||
|
||||
static void msm_gpio_irq_enable(struct irq_data *d)
|
||||
{
|
||||
/*
|
||||
* Clear the interrupt that may be pending before we enable
|
||||
* the line.
|
||||
* This is especially a problem with the GPIOs routed to the
|
||||
* PDC. These GPIOs are direct-connect interrupts to the GIC.
|
||||
* Disabling the interrupt line at the PDC does not prevent
|
||||
* the interrupt from being latched at the GIC. The state at
|
||||
* GIC needs to be cleared before enabling.
|
||||
*/
|
||||
if (d->parent_data) {
|
||||
irq_chip_set_parent_state(d, IRQCHIP_STATE_PENDING, 0);
|
||||
irq_chip_enable_parent(d);
|
||||
}
|
||||
struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
|
||||
struct msm_pinctrl *pctrl = gpiochip_get_data(gc);
|
||||
|
||||
msm_gpio_irq_clear_unmask(d, true);
|
||||
if (d->parent_data)
|
||||
irq_chip_enable_parent(d);
|
||||
|
||||
if (!test_bit(d->hwirq, pctrl->skip_wake_irqs))
|
||||
msm_gpio_irq_clear_unmask(d, true);
|
||||
}
|
||||
|
||||
static void msm_gpio_irq_disable(struct irq_data *d)
|
||||
@ -1104,6 +1097,19 @@ static int msm_gpio_irq_reqres(struct irq_data *d)
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
|
||||
/*
|
||||
* Clear the interrupt that may be pending before we enable
|
||||
* the line.
|
||||
* This is especially a problem with the GPIOs routed to the
|
||||
* PDC. These GPIOs are direct-connect interrupts to the GIC.
|
||||
* Disabling the interrupt line at the PDC does not prevent
|
||||
* the interrupt from being latched at the GIC. The state at
|
||||
* GIC needs to be cleared before enabling.
|
||||
*/
|
||||
if (d->parent_data && test_bit(d->hwirq, pctrl->skip_wake_irqs))
|
||||
irq_chip_set_parent_state(d, IRQCHIP_STATE_PENDING, 0);
|
||||
|
||||
return 0;
|
||||
out:
|
||||
module_put(gc->owner);
|
||||
|
||||
@ -1313,6 +1313,22 @@ static const struct msm_pingroup sm8250_groups[] = {
|
||||
[183] = SDC_PINGROUP(sdc2_data, 0xb7000, 9, 0),
|
||||
};
|
||||
|
||||
static const struct msm_gpio_wakeirq_map sm8250_pdc_map[] = {
|
||||
{ 0, 79 }, { 1, 84 }, { 2, 80 }, { 3, 82 }, { 4, 107 }, { 7, 43 },
|
||||
{ 11, 42 }, { 14, 44 }, { 15, 52 }, { 19, 67 }, { 23, 68 }, { 24, 105 },
|
||||
{ 27, 92 }, { 28, 106 }, { 31, 69 }, { 35, 70 }, { 39, 37 },
|
||||
{ 40, 108 }, { 43, 71 }, { 45, 72 }, { 47, 83 }, { 51, 74 }, { 55, 77 },
|
||||
{ 59, 78 }, { 63, 75 }, { 64, 81 }, { 65, 87 }, { 66, 88 }, { 67, 89 },
|
||||
{ 68, 54 }, { 70, 85 }, { 77, 46 }, { 80, 90 }, { 81, 91 }, { 83, 97 },
|
||||
{ 84, 98 }, { 86, 99 }, { 87, 100 }, { 88, 101 }, { 89, 102 },
|
||||
{ 92, 103 }, { 93, 104 }, { 100, 53 }, { 103, 47 }, { 104, 48 },
|
||||
{ 108, 49 }, { 109, 94 }, { 110, 95 }, { 111, 96 }, { 112, 55 },
|
||||
{ 113, 56 }, { 118, 50 }, { 121, 51 }, { 122, 57 }, { 123, 58 },
|
||||
{ 124, 45 }, { 126, 59 }, { 128, 76 }, { 129, 86 }, { 132, 93 },
|
||||
{ 133, 65 }, { 134, 66 }, { 136, 62 }, { 137, 63 }, { 138, 64 },
|
||||
{ 142, 60 }, { 143, 61 }
|
||||
};
|
||||
|
||||
static const struct msm_pinctrl_soc_data sm8250_pinctrl = {
|
||||
.pins = sm8250_pins,
|
||||
.npins = ARRAY_SIZE(sm8250_pins),
|
||||
@ -1323,6 +1339,8 @@ static const struct msm_pinctrl_soc_data sm8250_pinctrl = {
|
||||
.ngpios = 181,
|
||||
.tiles = sm8250_tiles,
|
||||
.ntiles = ARRAY_SIZE(sm8250_tiles),
|
||||
.wakeirq_map = sm8250_pdc_map,
|
||||
.nwakeirq_map = ARRAY_SIZE(sm8250_pdc_map),
|
||||
};
|
||||
|
||||
static int sm8250_pinctrl_probe(struct platform_device *pdev)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user