Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a7aac9d5b037be16d4ef5b1701b83774706daf53

Authored by Kukjin Kim
1 parent 20dbc43dd3
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

ARM: S5PV210: 2nd Change to using s3c_gpio_cfgrange_nopull() 

This patch changes code setting special-function and no pull-up
to use the s3c_gpio_cfgrange_nopull() wrapper.
NOTE: This is for missed things from the previous patch.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

Showing 4 changed files with 7 additions and 12 deletions Side-by-side Diff

arch/arm/mach-s5pv210/setup-fb-24bpp.c
Diff comments   View file @ a7aac9d
... ... @@ -23,7 +23,7 @@
23 23  
24 24 static void s5pv210_fb_cfg_gpios(unsigned int base, unsigned int nr)
25 25 {
26   - s3c_gpio_cfgall_range(base, nr, S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
  26 + s3c_gpio_cfgrange_nopull(base, nr, S3C_GPIO_SFN(2));
27 27  
28 28 for (; nr > 0; nr--, base++)
29 29 s5p_gpio_set_drvstr(base, S5P_GPIO_DRVSTR_LV4);
arch/arm/mach-s5pv210/setup-ide.c
Diff comments   View file @ a7aac9d
... ... @@ -17,7 +17,7 @@
17 17  
18 18 static void s5pv210_ide_cfg_gpios(unsigned int base, unsigned int nr)
19 19 {
20   - s3c_gpio_cfgall_range(base, nr, S3C_GPIO_SFN(4), S3C_GPIO_PULL_NONE);
  20 + s3c_gpio_cfgrange_nopull(base, nr, S3C_GPIO_SFN(4));
21 21  
22 22 for (; nr > 0; nr--, base++)
23 23 s5p_gpio_set_drvstr(base, S5P_GPIO_DRVSTR_LV4);
arch/arm/mach-s5pv210/setup-keypad.c
Diff comments   View file @ a7aac9d
... ... @@ -17,11 +17,9 @@
17 17 void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols)
18 18 {
19 19 /* Set all the necessary GPH3 pins to special-function 3: KP_ROW[x] */
20   - s3c_gpio_cfgall_range(S5PV210_GPH3(0), rows,
21   - S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
  20 + s3c_gpio_cfgrange_nopull(S5PV210_GPH3(0), rows, S3C_GPIO_SFN(3));
22 21  
23 22 /* Set all the necessary GPH2 pins to special-function 3: KP_COL[x] */
24   - s3c_gpio_cfgall_range(S5PV210_GPH2(0), cols,
25   - S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
  23 + s3c_gpio_cfgrange_nopull(S5PV210_GPH2(0), cols, S3C_GPIO_SFN(3));
26 24 }
arch/arm/mach-s5pv210/setup-sdhci-gpio.c
Diff comments   View file @ a7aac9d
... ... @@ -28,8 +28,7 @@
28 28 struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
29 29  
30 30 /* Set all the necessary GPG0/GPG1 pins to special-function 2 */
31   - s3c_gpio_cfgall_range(S5PV210_GPG0(0), 2,
32   - S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
  31 + s3c_gpio_cfgrange_nopull(S5PV210_GPG0(0), 2, S3C_GPIO_SFN(2));
33 32  
34 33 switch (width) {
35 34 case 8:
36 35  
... ... @@ -93,12 +92,10 @@
93 92 struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
94 93  
95 94 /* Set all the necessary GPG3[0:1] pins to special-function 2 */
96   - s3c_gpio_cfgall_range(S5PV210_GPG3(0), 2,
97   - S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
  95 + s3c_gpio_cfgrange_nopull(S5PV210_GPG3(0), 2, S3C_GPIO_SFN(2));
98 96  
99 97 /* Data pin GPG3[3:6] to special-function 2 */
100   - s3c_gpio_cfgall_range(S5PV210_GPG3(3), 4,
101   - S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
  98 + s3c_gpio_cfgrange_nopull(S5PV210_GPG3(3), 4, S3C_GPIO_SFN(2));
102 99  
103 100 if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
104 101 s3c_gpio_setpull(S5PV210_GPG3(2), S3C_GPIO_PULL_UP);