X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=target%2Flinux%2Fmediatek%2Fpatches%2F0053-pinctrl-mediatek-Add-Pinctrl-GPIO-driver-for-mt6397.patch;h=aa0f4d30ceadebc91ba1bc4adf650228800661a8;hp=2813f407d5990f1b56afc7f60795745d75ff1c6e;hb=c628ae4b0b0f0ff9d34adffb4086b91ad9737b0a;hpb=557ed0f822054d025d23f8984181b514e5f51813

diff --git a/target/linux/mediatek/patches/0053-pinctrl-mediatek-Add-Pinctrl-GPIO-driver-for-mt6397.patch b/target/linux/mediatek/patches/0053-pinctrl-mediatek-Add-Pinctrl-GPIO-driver-for-mt6397.patch
index 2813f407d5..aa0f4d30ce 100644
--- a/target/linux/mediatek/patches/0053-pinctrl-mediatek-Add-Pinctrl-GPIO-driver-for-mt6397.patch
+++ b/target/linux/mediatek/patches/0053-pinctrl-mediatek-Add-Pinctrl-GPIO-driver-for-mt6397.patch
@@ -26,8 +26,6 @@ Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
  create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt6397.c
  create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt6397.h
 
-diff --git a/drivers/pinctrl/mediatek/Kconfig b/drivers/pinctrl/mediatek/Kconfig
-index 6b3551c..ddae479 100644
 --- a/drivers/pinctrl/mediatek/Kconfig
 +++ b/drivers/pinctrl/mediatek/Kconfig
 @@ -23,4 +23,10 @@ config PINCTRL_MT8173
@@ -41,18 +39,13 @@ index 6b3551c..ddae479 100644
 +	select PINCTRL_MTK_COMMON
 +
  endif
-diff --git a/drivers/pinctrl/mediatek/Makefile b/drivers/pinctrl/mediatek/Makefile
-index d8606a2..ad0180c 100644
 --- a/drivers/pinctrl/mediatek/Makefile
 +++ b/drivers/pinctrl/mediatek/Makefile
-@@ -4,3 +4,4 @@ obj-$(CONFIG_PINCTRL_MTK_COMMON)	+= pinctrl-mtk-common.o
+@@ -4,3 +4,4 @@ obj-$(CONFIG_PINCTRL_MTK_COMMON)	+= pinc
  # SoC Drivers
  obj-$(CONFIG_PINCTRL_MT8135)		+= pinctrl-mt8135.o
  obj-$(CONFIG_PINCTRL_MT8173)		+= pinctrl-mt8173.o
 +obj-$(CONFIG_PINCTRL_MT6397)		+= pinctrl-mt6397.o
-diff --git a/drivers/pinctrl/mediatek/pinctrl-mt6397.c b/drivers/pinctrl/mediatek/pinctrl-mt6397.c
-new file mode 100644
-index 0000000..767bbdf
 --- /dev/null
 +++ b/drivers/pinctrl/mediatek/pinctrl-mt6397.c
 @@ -0,0 +1,78 @@
@@ -134,11 +127,9 @@ index 0000000..767bbdf
 +MODULE_LICENSE("GPL v2");
 +MODULE_DESCRIPTION("MediaTek MT6397 Pinctrl Driver");
 +MODULE_AUTHOR("Hongzhou Yang <hongzhou.yang@mediatek.com>");
-diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8135.c b/drivers/pinctrl/mediatek/pinctrl-mt8135.c
-index 8e6abd5..203bd2a 100644
 --- a/drivers/pinctrl/mediatek/pinctrl-mt8135.c
 +++ b/drivers/pinctrl/mediatek/pinctrl-mt8135.c
-@@ -342,7 +342,7 @@ static const struct mtk_pinctrl_devdata mt8135_pinctrl_data = {
+@@ -342,7 +342,7 @@ static const struct mtk_pinctrl_devdata
  
  static int mt8135_pinctrl_probe(struct platform_device *pdev)
  {
@@ -147,11 +138,9 @@ index 8e6abd5..203bd2a 100644
  }
  
  static const struct of_device_id mt8135_pctrl_match[] = {
-diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8173.c b/drivers/pinctrl/mediatek/pinctrl-mt8173.c
-index a7e5b24..cf4ed6e 100644
 --- a/drivers/pinctrl/mediatek/pinctrl-mt8173.c
 +++ b/drivers/pinctrl/mediatek/pinctrl-mt8173.c
-@@ -361,7 +361,7 @@ static const struct mtk_pinctrl_devdata mt8173_pinctrl_data = {
+@@ -361,7 +361,7 @@ static const struct mtk_pinctrl_devdata
  
  static int mt8173_pinctrl_probe(struct platform_device *pdev)
  {
@@ -160,11 +149,9 @@ index a7e5b24..cf4ed6e 100644
  }
  
  static const struct of_device_id mt8173_pctrl_match[] = {
-diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
-index 97fe2ab..e772cef 100644
 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
 +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
-@@ -1209,7 +1209,8 @@ static struct pinctrl_desc mtk_pctrl_desc = {
+@@ -1209,7 +1209,8 @@ static struct pinctrl_desc mtk_pctrl_des
  };
  
  int mtk_pctrl_init(struct platform_device *pdev,
@@ -174,7 +161,7 @@ index 97fe2ab..e772cef 100644
  {
  	struct pinctrl_pin_desc *pins;
  	struct mtk_pinctrl *pctl;
-@@ -1235,6 +1236,11 @@ int mtk_pctrl_init(struct platform_device *pdev,
+@@ -1235,6 +1236,11 @@ int mtk_pctrl_init(struct platform_devic
  		pctl->regmap1 = syscon_node_to_regmap(node);
  		if (IS_ERR(pctl->regmap1))
  			return PTR_ERR(pctl->regmap1);
@@ -186,7 +173,7 @@ index 97fe2ab..e772cef 100644
  	}
  
  	/* Only 8135 has two base addr, other SoCs have only one. */
-@@ -1280,7 +1286,7 @@ int mtk_pctrl_init(struct platform_device *pdev,
+@@ -1280,7 +1286,7 @@ int mtk_pctrl_init(struct platform_devic
  	pctl->chip->ngpio = pctl->devdata->npins;
  	pctl->chip->label = dev_name(&pdev->dev);
  	pctl->chip->dev = &pdev->dev;
@@ -195,7 +182,7 @@ index 97fe2ab..e772cef 100644
  
  	ret = gpiochip_add(pctl->chip);
  	if (ret) {
-@@ -1296,6 +1302,9 @@ int mtk_pctrl_init(struct platform_device *pdev,
+@@ -1296,6 +1302,9 @@ int mtk_pctrl_init(struct platform_devic
  		goto chip_error;
  	}
  
@@ -205,8 +192,6 @@ index 97fe2ab..e772cef 100644
  	/* Get EINT register base from dts. */
  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
  	if (!res) {
-diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.h b/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
-index c703e7d..30213e5 100644
 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
 +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
 @@ -269,7 +269,8 @@ struct mtk_pinctrl {
@@ -219,9 +204,6 @@ index c703e7d..30213e5 100644
  
  int mtk_pctrl_spec_pull_set_samereg(struct regmap *regmap,
  		const struct mtk_pin_spec_pupd_set_samereg *pupd_infos,
-diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-mt6397.h b/drivers/pinctrl/mediatek/pinctrl-mtk-mt6397.h
-new file mode 100644
-index 0000000..4eb98dd
 --- /dev/null
 +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-mt6397.h
 @@ -0,0 +1,424 @@
@@ -649,6 +631,3 @@ index 0000000..4eb98dd
 +};
 +
 +#endif /* __PINCTRL_MTK_MT6397_H */
--- 
-1.7.10.4
-