hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARM: ux500: move AB8500 EXTCPENA from board file to DT 

This moves the configuration of the AB8500 EXTCPENA pin
from the board file to the device tree.

Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2014-02-03 22:56:27 +01:00
parent 1f04159e9e
commit 81d78492e8
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/arm/boot/dts/ste-href-ab8500.dtsi
View File

@ -36,7 +36,8 @@
<&pwm_default_mode>, <&pwm_default_mode>,
<&adi1_default_mode>, <&adi1_default_mode>,
<&usbuicc_default_mode>, <&usbuicc_default_mode>,
<&dmic_default_mode>; <&dmic_default_mode>,
<&extcpena_default_mode>;
/* /*
* Pins 2, 4, 10, 11, 12, 13, 16, 24, 25, 36, 37, 38, 39 and 42 * Pins 2, 4, 10, 11, 12, 13, 16, 24, 25, 36, 37, 38, 39 and 42
@ -340,7 +341,19 @@
}; };
}; };
}; };
extcpena {
extcpena_default_mode: extcpena_default {
default_mux {
ste,function = "extcpena";
ste,pins = "extcpena_d_1";
};
default_cfg {
ste,pins = "GPIO34_R17";
input-enable;
bias-pull-down;
};
};
};
}; };
}; };
}; };

7
arch/arm/mach-ux500/board-mop500-pins.c
View File

@ -56,13 +56,6 @@ static struct pinctrl_map __initdata ab8500_pinmap[] = {
AB8500_MUX_STATE("gpio3_a_1", "gpio", "regulator.36", PINCTRL_STATE_SLEEP), AB8500_MUX_STATE("gpio3_a_1", "gpio", "regulator.36", PINCTRL_STATE_SLEEP),
AB8500_PIN_STATE("GPIO3_U9", in_pd, "regulator.36", PINCTRL_STATE_SLEEP), AB8500_PIN_STATE("GPIO3_U9", in_pd, "regulator.36", PINCTRL_STATE_SLEEP),
/*
* pins 34 is muxed in EXTCPENA
* configured INPUT PULL DOWN
*/
AB8500_MUX_HOG("extcpena_d_1", "extcpena"),
AB8500_PIN_HOG("GPIO34_R17", in_pd),
/* /*
* pins 40 and 41 are muxed in MODCSLSDA * pins 40 and 41 are muxed in MODCSLSDA
* configured INPUT PULL DOWN * configured INPUT PULL DOWN