Commit 31c9c4c5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pinctrl-v6.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl 

Pull pin control fixes from Linus Walleij:
 "Aere is a hopefully final round of pin control fixes. Nothing special,
  driver fixes and we caught a potential NULL pointer exception.

   - Fix a potential NULL dereference in the core!

   - Fix all pin mux routes in the Rockchop PX30 driver

   - Fix the UFS pins in the Qualcomm SC8280XP driver

   - Fix bias disabling in the Mediatek driver

   - Fix debounce time settings in the Mediatek driver"

* tag 'pinctrl-v6.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: mediatek: Export debounce time tables
  pinctrl: mediatek: Fix EINT pins input debounce time configuration
  pinctrl: devicetree: fix null pointer dereferencing in pinctrl_dt_to_map
  pinctrl: mediatek: common-v2: Fix bias-disable for PULL_PU_PD_RSEL_TYPE
  pinctrl: qcom: sc8280xp: Rectify UFS reset pins
  pinctrl: rockchip: list all pins in a possible mux route for PX30
parents 941209ef 2e35b25d

drivers/pinctrl/devicetree.c

+2 −0
Original line number Diff line number Diff line
@@ -220,6 +220,8 @@ int pinctrl_dt_to_map(struct pinctrl *p, struct pinctrl_dev *pctldev) 
	for (state = 0; ; state++) {

		/* Retrieve the pinctrl-* property */

		propname = kasprintf(GFP_KERNEL, "pinctrl-%d", state);

		if (!propname)

			return -ENOMEM;

		prop = of_find_property(np, propname, &size);

		kfree(propname);

		if (!prop) {

drivers/pinctrl/mediatek/mtk-eint.c

+29 −5
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#define MTK_EINT_EDGE_SENSITIVE           0

#define MTK_EINT_LEVEL_SENSITIVE          1

#define MTK_EINT_DBNC_SET_DBNC_BITS	  4

#define MTK_EINT_DBNC_MAX		  16

#define MTK_EINT_DBNC_RST_BIT		  (0x1 << 1)

#define MTK_EINT_DBNC_SET_EN		  (0x1 << 0)
@@ -48,6 +49,21 @@ static const struct mtk_eint_regs mtk_generic_eint_regs = { 
	.dbnc_clr  = 0x700,

};



const unsigned int debounce_time_mt2701[] = {

	500, 1000, 16000, 32000, 64000, 128000, 256000, 0

};

EXPORT_SYMBOL_GPL(debounce_time_mt2701);



const unsigned int debounce_time_mt6765[] = {

	125, 250, 500, 1000, 16000, 32000, 64000, 128000, 256000, 512000, 0

};

EXPORT_SYMBOL_GPL(debounce_time_mt6765);



const unsigned int debounce_time_mt6795[] = {

	500, 1000, 16000, 32000, 64000, 128000, 256000, 512000, 0

};

EXPORT_SYMBOL_GPL(debounce_time_mt6795);



static void __iomem *mtk_eint_get_offset(struct mtk_eint *eint,

					 unsigned int eint_num,

					 unsigned int offset)
@@ -404,10 +420,11 @@ int mtk_eint_set_debounce(struct mtk_eint *eint, unsigned long eint_num, 
	int virq, eint_offset;

	unsigned int set_offset, bit, clr_bit, clr_offset, rst, i, unmask,

		     dbnc;

	static const unsigned int debounce_time[] = {500, 1000, 16000, 32000,

						     64000, 128000, 256000};

	struct irq_data *d;



	if (!eint->hw->db_time)

		return -EOPNOTSUPP;



	virq = irq_find_mapping(eint->domain, eint_num);

	eint_offset = (eint_num % 4) * 8;

	d = irq_get_irq_data(virq);
@@ -418,9 +435,9 @@ int mtk_eint_set_debounce(struct mtk_eint *eint, unsigned long eint_num, 
	if (!mtk_eint_can_en_debounce(eint, eint_num))

		return -EINVAL;



	dbnc = ARRAY_SIZE(debounce_time);

	for (i = 0; i < ARRAY_SIZE(debounce_time); i++) {

		if (debounce <= debounce_time[i]) {

	dbnc = eint->num_db_time;

	for (i = 0; i < eint->num_db_time; i++) {

		if (debounce <= eint->hw->db_time[i]) {

			dbnc = i;

			break;

		}
@@ -494,6 +511,13 @@ int mtk_eint_do_init(struct mtk_eint *eint) 
	if (!eint->domain)

		return -ENOMEM;



	if (eint->hw->db_time) {

		for (i = 0; i < MTK_EINT_DBNC_MAX; i++)

			if (eint->hw->db_time[i] == 0)

				break;

		eint->num_db_time = i;

	}



	mtk_eint_hw_init(eint);

	for (i = 0; i < eint->hw->ap_num; i++) {

		int virq = irq_create_mapping(eint->domain, i);

drivers/pinctrl/mediatek/mtk-eint.h

+6 −0
Original line number Diff line number Diff line
@@ -37,8 +37,13 @@ struct mtk_eint_hw { 
	u8		ports;

	unsigned int	ap_num;

	unsigned int	db_cnt;

	const unsigned int *db_time;

};



extern const unsigned int debounce_time_mt2701[];

extern const unsigned int debounce_time_mt6765[];

extern const unsigned int debounce_time_mt6795[];



struct mtk_eint;



struct mtk_eint_xt {
@@ -62,6 +67,7 @@ struct mtk_eint { 
	/* Used to fit into various EINT device */

	const struct mtk_eint_hw *hw;

	const struct mtk_eint_regs *regs;

	u16 num_db_time;



	/* Used to fit into various pinctrl device */

	void *pctl;

drivers/pinctrl/mediatek/pinctrl-mt2701.c

+1 −0
Original line number Diff line number Diff line
@@ -518,6 +518,7 @@ static const struct mtk_pinctrl_devdata mt2701_pinctrl_data = { 
		.ports     = 6,

		.ap_num    = 169,

		.db_cnt    = 16,

		.db_time   = debounce_time_mt2701,

	},

};

drivers/pinctrl/mediatek/pinctrl-mt2712.c

+1 −0
Original line number Diff line number Diff line
@@ -567,6 +567,7 @@ static const struct mtk_pinctrl_devdata mt2712_pinctrl_data = { 
		.ports     = 8,

		.ap_num    = 229,

		.db_cnt    = 40,

		.db_time   = debounce_time_mt2701,

	},

};