aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mediatek/patches-4.19/0005-pinctrl-mediatek-sync-with-5.3.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-11-06 17:19:11 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-11-12 10:15:01 +0100
commit6589de9af79f58175e4af22a98122e62896aba8a (patch)
tree40e8b738f55403142982fb6680835cf284526f5d /target/linux/mediatek/patches-4.19/0005-pinctrl-mediatek-sync-with-5.3.patch
parentecfe552f9915eb6bf10fce473b4a4ea9e6c07840 (diff)
downloadupstream-6589de9af79f58175e4af22a98122e62896aba8a.tar.gz
upstream-6589de9af79f58175e4af22a98122e62896aba8a.tar.bz2
upstream-6589de9af79f58175e4af22a98122e62896aba8a.zip
kernel: bump 4.19 to 4.19.82
Refreshed all patches. Remove upstreamed: - 950-0295-sc16is7xx-Fix-for-Unexpected-interrupt-8.patch Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/mediatek/patches-4.19/0005-pinctrl-mediatek-sync-with-5.3.patch')
-rw-r--r--target/linux/mediatek/patches-4.19/0005-pinctrl-mediatek-sync-with-5.3.patch125
1 files changed, 31 insertions, 94 deletions
diff --git a/target/linux/mediatek/patches-4.19/0005-pinctrl-mediatek-sync-with-5.3.patch b/target/linux/mediatek/patches-4.19/0005-pinctrl-mediatek-sync-with-5.3.patch
index 129b48dfce..56c2dcfdb7 100644
--- a/target/linux/mediatek/patches-4.19/0005-pinctrl-mediatek-sync-with-5.3.patch
+++ b/target/linux/mediatek/patches-4.19/0005-pinctrl-mediatek-sync-with-5.3.patch
@@ -53,8 +53,6 @@ a1a503a8c332 pinctrl: mediatek: add pinctrl-mtk-common-v2 for all MediaTek pinct
1c5fb66afa2a pinctrl: Include <linux/gpio/driver.h> nothing else
94f4e54cecaf pinctrl: Convert to using %pOFn instead of device_node.name
-diff --git a/drivers/pinctrl/mediatek/Kconfig b/drivers/pinctrl/mediatek/Kconfig
-index 9905dc672f6b..26ed5dca1460 100644
--- a/drivers/pinctrl/mediatek/Kconfig
+++ b/drivers/pinctrl/mediatek/Kconfig
@@ -3,7 +3,8 @@ menu "MediaTek pinctrl drivers"
@@ -113,7 +111,7 @@ index 9905dc672f6b..26ed5dca1460 100644
config PINCTRL_MT8135
bool "Mediatek MT8135 pin control"
depends on MACH_MT8135 || COMPILE_TEST
-@@ -45,15 +78,26 @@ config PINCTRL_MT2712
+@@ -45,21 +78,46 @@ config PINCTRL_MT2712
default ARM64 && ARCH_MEDIATEK
select PINCTRL_MTK
@@ -145,10 +143,11 @@ index 9905dc672f6b..26ed5dca1460 100644
config PINCTRL_MT8173
bool "Mediatek MT8173 pin control"
-@@ -62,6 +106,20 @@ config PINCTRL_MT8173
+ depends on OF
+ depends on ARM64 || COMPILE_TEST
default ARM64 && ARCH_MEDIATEK
- select PINCTRL_MTK
-
++ select PINCTRL_MTK
++
+config PINCTRL_MT8183
+ bool "Mediatek MT8183 pin control"
+ depends on OF
@@ -161,13 +160,9 @@ index 9905dc672f6b..26ed5dca1460 100644
+ depends on OF
+ depends on ARM64 || COMPILE_TEST
+ default ARM64 && ARCH_MEDIATEK
-+ select PINCTRL_MTK
-+
+ select PINCTRL_MTK
+
# For PMIC
- config PINCTRL_MT6397
- bool "Mediatek MT6397 pin control"
-diff --git a/drivers/pinctrl/mediatek/Makefile b/drivers/pinctrl/mediatek/Makefile
-index 3de7156df345..a74325abd877 100644
--- a/drivers/pinctrl/mediatek/Makefile
+++ b/drivers/pinctrl/mediatek/Makefile
@@ -2,12 +2,20 @@
@@ -191,8 +186,6 @@ index 3de7156df345..a74325abd877 100644
+obj-$(CONFIG_PINCTRL_MT8183) += pinctrl-mt8183.o
+obj-$(CONFIG_PINCTRL_MT8516) += pinctrl-mt8516.o
obj-$(CONFIG_PINCTRL_MT6397) += pinctrl-mt6397.o
-diff --git a/drivers/pinctrl/mediatek/mtk-eint.c b/drivers/pinctrl/mediatek/mtk-eint.c
-index a613e546717a..f464f8cd274b 100644
--- a/drivers/pinctrl/mediatek/mtk-eint.c
+++ b/drivers/pinctrl/mediatek/mtk-eint.c
@@ -11,7 +11,7 @@
@@ -204,11 +197,9 @@ index a613e546717a..f464f8cd274b 100644
#include <linux/io.h>
#include <linux/irqchip/chained_irq.h>
#include <linux/irqdomain.h>
-diff --git a/drivers/pinctrl/mediatek/mtk-eint.h b/drivers/pinctrl/mediatek/mtk-eint.h
-index c286a9b940f2..48468d0fae68 100644
--- a/drivers/pinctrl/mediatek/mtk-eint.h
+++ b/drivers/pinctrl/mediatek/mtk-eint.h
-@@ -92,13 +92,13 @@ static inline int mtk_eint_do_resume(struct mtk_eint *eint)
+@@ -92,13 +92,13 @@ static inline int mtk_eint_do_resume(str
return -EOPNOTSUPP;
}
@@ -224,9 +215,6 @@ index c286a9b940f2..48468d0fae68 100644
{
return -EOPNOTSUPP;
}
-diff --git a/drivers/pinctrl/mediatek/pinctrl-moore.c b/drivers/pinctrl/mediatek/pinctrl-moore.c
-new file mode 100644
-index 000000000000..aa1068d2867f
--- /dev/null
+++ b/drivers/pinctrl/mediatek/pinctrl-moore.c
@@ -0,0 +1,690 @@
@@ -920,9 +908,6 @@ index 000000000000..aa1068d2867f
+
+ return 0;
+}
-diff --git a/drivers/pinctrl/mediatek/pinctrl-moore.h b/drivers/pinctrl/mediatek/pinctrl-moore.h
-new file mode 100644
-index 000000000000..e1b4b82b9d3d
--- /dev/null
+++ b/drivers/pinctrl/mediatek/pinctrl-moore.h
@@ -0,0 +1,51 @@
@@ -977,9 +962,6 @@ index 000000000000..e1b4b82b9d3d
+ const struct mtk_pin_soc *soc);
+
+#endif /* __PINCTRL_MOORE_H */
-diff --git a/drivers/pinctrl/mediatek/pinctrl-mt6765.c b/drivers/pinctrl/mediatek/pinctrl-mt6765.c
-new file mode 100644
-index 000000000000..32451e8693be
--- /dev/null
+++ b/drivers/pinctrl/mediatek/pinctrl-mt6765.c
@@ -0,0 +1,1108 @@
@@ -2091,9 +2073,6 @@ index 000000000000..32451e8693be
+ return platform_driver_register(&mt6765_pinctrl_driver);
+}
+arch_initcall(mt6765_pinctrl_init);
-diff --git a/drivers/pinctrl/mediatek/pinctrl-mt6797.c b/drivers/pinctrl/mediatek/pinctrl-mt6797.c
-new file mode 100644
-index 000000000000..adebe4333ed9
--- /dev/null
+++ b/drivers/pinctrl/mediatek/pinctrl-mt6797.c
@@ -0,0 +1,82 @@
@@ -2179,8 +2158,6 @@ index 000000000000..adebe4333ed9
+ return platform_driver_register(&mt6797_pinctrl_driver);
+}
+arch_initcall(mt6797_pinctrl_init);
-diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7622.c b/drivers/pinctrl/mediatek/pinctrl-mt7622.c
-index 6f931b85701b..ce4a8a0cc19c 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt7622.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7622.c
@@ -1,297 +1,140 @@
@@ -2266,14 +2243,14 @@ index 6f931b85701b..ce4a8a0cc19c 100644
- * @bitpos: the start bit relative to the register
- * @next: the indication that the field would be extended to the
- next register
- */
+- */
-struct mtk_pin_field {
- u32 offset;
- u32 mask;
- u8 bitpos;
- u8 next;
-};
-
+-
-/* struct mtk_pin_field_calc - the structure that holds the range providing
- * the guide used to look up the relevant field
- * @s_pin: the start pin within the range
@@ -2293,19 +2270,18 @@ index 6f931b85701b..ce4a8a0cc19c 100644
- u8 s_bit;
- u8 x_bits;
-};
-+#include "pinctrl-moore.h"
-
+-
-/* struct mtk_pin_reg_calc - the structure that holds all ranges used to
- * determine which register the pin would make use of
- * for certain pin attribute.
- * @range: the start address for the range
- * @nranges: the number of items in the range
-- */
+ */
-struct mtk_pin_reg_calc {
- const struct mtk_pin_field_calc *range;
- unsigned int nranges;
-};
--
+
-/* struct mtk_pin_soc - the structure that holds SoC-specific data */
-struct mtk_pin_soc {
- const struct mtk_pin_reg_calc *reg_cal;
@@ -2318,7 +2294,8 @@ index 6f931b85701b..ce4a8a0cc19c 100644
- const struct mtk_eint_regs *eint_regs;
- const struct mtk_eint_hw *eint_hw;
-};
--
++#include "pinctrl-moore.h"
+
-struct mtk_pinctrl {
- struct pinctrl_dev *pctrl;
- void __iomem *base;
@@ -2577,7 +2554,7 @@ index 6f931b85701b..ce4a8a0cc19c 100644
};
static const struct mtk_pin_reg_calc mt7622_reg_cals[PINCTRL_PIN_REG_MAX] = {
-@@ -309,110 +152,110 @@ static const struct mtk_pin_reg_calc mt7622_reg_cals[PINCTRL_PIN_REG_MAX] = {
+@@ -309,110 +152,110 @@ static const struct mtk_pin_reg_calc mt7
[PINCTRL_PIN_REG_RDSEL] = MTK_RANGE(mt7622_pin_rdsel_range),
};
@@ -2792,7 +2769,7 @@ index 6f931b85701b..ce4a8a0cc19c 100644
};
/* List all groups consisting of these pins dedicated to the enablement of
-@@ -906,18 +749,6 @@ static const struct function_desc mt7622_functions[] = {
+@@ -906,18 +749,6 @@ static const struct function_desc mt7622
{"watchdog", mt7622_wdt_groups, ARRAY_SIZE(mt7622_wdt_groups)},
};
@@ -2811,12 +2788,22 @@ index 6f931b85701b..ce4a8a0cc19c 100644
static const struct mtk_eint_hw mt7622_eint_hw = {
.port_mask = 7,
.ports = 7,
-@@ -934,830 +765,38 @@ static const struct mtk_pin_soc mt7622_data = {
+@@ -934,830 +765,38 @@ static const struct mtk_pin_soc mt7622_d
.funcs = mt7622_functions,
.nfuncs = ARRAY_SIZE(mt7622_functions),
.eint_hw = &mt7622_eint_hw,
--};
--
++ .gpio_m = 1,
++ .ies_present = false,
++ .base_names = mtk_default_register_base_names,
++ .nbase_names = ARRAY_SIZE(mtk_default_register_base_names),
++ .bias_disable_set = mtk_pinconf_bias_disable_set,
++ .bias_disable_get = mtk_pinconf_bias_disable_get,
++ .bias_set = mtk_pinconf_bias_set,
++ .bias_get = mtk_pinconf_bias_get,
++ .drive_set = mtk_pinconf_drive_set,
++ .drive_get = mtk_pinconf_drive_get,
+ };
+
-static void mtk_w32(struct mtk_pinctrl *pctl, u32 reg, u32 val)
-{
- writel_relaxed(val, pctl->base + reg);
@@ -3549,18 +3536,6 @@ index 6f931b85701b..ce4a8a0cc19c 100644
-
-static const struct of_device_id mtk_pinctrl_of_match[] = {
- { .compatible = "mediatek,mt7622-pinctrl", .data = &mt7622_data},
-+ .gpio_m = 1,
-+ .ies_present = false,
-+ .base_names = mtk_default_register_base_names,
-+ .nbase_names = ARRAY_SIZE(mtk_default_register_base_names),
-+ .bias_disable_set = mtk_pinconf_bias_disable_set,
-+ .bias_disable_get = mtk_pinconf_bias_disable_get,
-+ .bias_set = mtk_pinconf_bias_set,
-+ .bias_get = mtk_pinconf_bias_get,
-+ .drive_set = mtk_pinconf_drive_set,
-+ .drive_get = mtk_pinconf_drive_get,
-+};
-+
+static const struct of_device_id mt7622_pinctrl_of_match[] = {
+ { .compatible = "mediatek,mt7622-pinctrl", },
{ }
@@ -3665,9 +3640,6 @@ index 6f931b85701b..ce4a8a0cc19c 100644
}
-arch_initcall(mtk_pinctrl_init);
+arch_initcall(mt7622_pinctrl_init);
-diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7623.c b/drivers/pinctrl/mediatek/pinctrl-mt7623.c
-new file mode 100644
-index 000000000000..b8d9d31db74f
--- /dev/null
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7623.c
@@ -0,0 +1,1441 @@
@@ -5112,9 +5084,6 @@ index 000000000000..b8d9d31db74f
+ return platform_driver_register(&mtk_pinctrl_driver);
+}
+arch_initcall(mtk_pinctrl_init);
-diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7629.c b/drivers/pinctrl/mediatek/pinctrl-mt7629.c
-new file mode 100644
-index 000000000000..b5f0fa43245f
--- /dev/null
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7629.c
@@ -0,0 +1,450 @@
@@ -5568,9 +5537,6 @@ index 000000000000..b5f0fa43245f
+ return platform_driver_register(&mt7629_pinctrl_driver);
+}
+arch_initcall(mt7629_pinctrl_init);
-diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8183.c b/drivers/pinctrl/mediatek/pinctrl-mt8183.c
-new file mode 100644
-index 000000000000..9a74d5025be6
--- /dev/null
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8183.c
@@ -0,0 +1,595 @@
@@ -6169,9 +6135,6 @@ index 000000000000..9a74d5025be6
+ return platform_driver_register(&mt8183_pinctrl_driver);
+}
+arch_initcall(mt8183_pinctrl_init);
-diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8516.c b/drivers/pinctrl/mediatek/pinctrl-mt8516.c
-new file mode 100644
-index 000000000000..b375426aa61e
--- /dev/null
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8516.c
@@ -0,0 +1,362 @@
@@ -6537,9 +6500,6 @@ index 000000000000..b375426aa61e
+ return platform_driver_register(&mtk_pinctrl_driver);
+}
+arch_initcall(mtk_pinctrl_init);
-diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
-new file mode 100644
-index 000000000000..20e1c890e73b
--- /dev/null
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
@@ -0,0 +1,725 @@
@@ -7268,9 +7228,6 @@ index 000000000000..20e1c890e73b
+
+ return 0;
+}
-diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h
-new file mode 100644
-index 000000000000..1b7da42aa1d5
--- /dev/null
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h
@@ -0,0 +1,302 @@
@@ -7576,11 +7533,9 @@ index 000000000000..1b7da42aa1d5
+ const struct mtk_pin_desc *desc, u32 *val);
+
+#endif /* __PINCTRL_MTK_COMMON_V2_H */
-diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
-index 16ff56f93501..071623873ca5 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
-@@ -514,8 +514,8 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
+@@ -514,8 +514,8 @@ static int mtk_pctrl_dt_subnode_to_map(s
pins = of_find_property(node, "pinmux", NULL);
if (!pins) {
@@ -7591,9 +7546,6 @@ index 16ff56f93501..071623873ca5 100644
return -EINVAL;
}
-diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-mt6765.h b/drivers/pinctrl/mediatek/pinctrl-mtk-mt6765.h
-new file mode 100644
-index 000000000000..772563720461
--- /dev/null
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-mt6765.h
@@ -0,0 +1,1754 @@
@@ -9351,9 +9303,6 @@ index 000000000000..772563720461
+};
+
+#endif /* __PINCTRL_MTK_MT6765_H */
-diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-mt6797.h b/drivers/pinctrl/mediatek/pinctrl-mtk-mt6797.h
-new file mode 100644
-index 000000000000..86ab78e80326
--- /dev/null
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-mt6797.h
@@ -0,0 +1,2429 @@
@@ -11786,9 +11735,6 @@ index 000000000000..86ab78e80326
+};
+
+#endif /* __PINCTRL_MTK_MT6797_H */
-diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-mt8183.h b/drivers/pinctrl/mediatek/pinctrl-mtk-mt8183.h
-new file mode 100644
-index 000000000000..79adf5b8a186
--- /dev/null
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-mt8183.h
@@ -0,0 +1,1916 @@
@@ -13708,9 +13654,6 @@ index 000000000000..79adf5b8a186
+};
+
+#endif /* __PINCTRL_MTK_MT8183_H */
-diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-mt8516.h b/drivers/pinctrl/mediatek/pinctrl-mtk-mt8516.h
-new file mode 100644
-index 000000000000..f7a4c6e4a026
--- /dev/null
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-mt8516.h
@@ -0,0 +1,1182 @@
@@ -14896,9 +14839,6 @@ index 000000000000..f7a4c6e4a026
+};
+
+#endif /* __PINCTRL_MTK_MT8516_H */
-diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.c b/drivers/pinctrl/mediatek/pinctrl-paris.c
-new file mode 100644
-index 000000000000..923264d0e9ef
--- /dev/null
+++ b/drivers/pinctrl/mediatek/pinctrl-paris.c
@@ -0,0 +1,947 @@
@@ -15849,9 +15789,6 @@ index 000000000000..923264d0e9ef
+ .suspend_noirq = mtk_paris_pinctrl_suspend,
+ .resume_noirq = mtk_paris_pinctrl_resume,
+};
-diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.h b/drivers/pinctrl/mediatek/pinctrl-paris.h
-new file mode 100644
-index 000000000000..3d43771074e6
--- /dev/null
+++ b/drivers/pinctrl/mediatek/pinctrl-paris.h
@@ -0,0 +1,65 @@