Merge "ipq40xx: Update emmc pin configs"

This commit is contained in:
Linux Build Service Account 2018-02-08 05:06:22 -08:00 committed by Gerrit - the friendly Code Review server
commit abdb324398
3 changed files with 29 additions and 23 deletions

View file

@ -98,7 +98,7 @@
gpio = <23>;
func = <1>;
pull = <GPIO_PULL_UP>;
drvstr = <GPIO_10MA>;
drvstr = <DRV_TYPE_C>;
oe = <GPIO_OE_DISABLE>;
vm = <GPIO_VM_ENABLE>;
od_en = <GPIO_OD_DISABLE>;
@ -109,7 +109,7 @@
gpio = <24>;
func = <1>;
pull = <GPIO_PULL_UP>;
drvstr = <GPIO_10MA>;
drvstr = <DRV_TYPE_C>;
oe = <GPIO_OE_DISABLE>;
vm = <GPIO_VM_ENABLE>;
od_en = <GPIO_OD_DISABLE>;
@ -120,7 +120,7 @@
gpio = <25>;
func = <1>;
pull = <GPIO_PULL_UP>;
drvstr = <GPIO_10MA>;
drvstr = <DRV_TYPE_C>;
oe = <GPIO_OE_DISABLE>;
vm = <GPIO_VM_ENABLE>;
od_en = <GPIO_OD_DISABLE>;
@ -130,7 +130,7 @@
gpio4 {
gpio = <26>;
func = <1>;
pull = <GPIO_PULL_UP>;
pull = <DRV_TYPE_C>;
drvstr = <GPIO_10MA>;
oe = <GPIO_OE_DISABLE>;
vm = <GPIO_VM_ENABLE>;
@ -142,7 +142,7 @@
gpio = <27>;
func = <1>;
pull = <GPIO_PULL_UP>;
drvstr = <GPIO_16MA>;
drvstr = <DRV_TYPE_A>;
oe = <GPIO_OE_DISABLE>;
vm = <GPIO_VM_ENABLE>;
od_en = <GPIO_OD_DISABLE>;
@ -153,7 +153,7 @@
gpio = <28>;
func = <1>;
pull = <GPIO_PULL_UP>;
drvstr = <GPIO_10MA>;
drvstr = <DRV_TYPE_C>;
oe = <GPIO_OE_DISABLE>;
vm = <GPIO_VM_ENABLE>;
od_en = <GPIO_OD_DISABLE>;
@ -164,7 +164,7 @@
gpio = <29>;
func = <1>;
pull = <GPIO_PULL_UP>;
drvstr = <GPIO_10MA>;
drvstr = <DRV_TYPE_C>;
oe = <GPIO_OE_DISABLE>;
vm = <GPIO_VM_ENABLE>;
od_en = <GPIO_OD_DISABLE>;
@ -175,7 +175,7 @@
gpio = <30>;
func = <1>;
pull = <GPIO_PULL_UP>;
drvstr = <GPIO_10MA>;
drvstr = <DRV_TYPE_C>;
oe = <GPIO_OE_DISABLE>;
vm = <GPIO_VM_ENABLE>;
od_en = <GPIO_OD_DISABLE>;
@ -186,7 +186,7 @@
gpio = <31>;
func = <1>;
pull = <GPIO_PULL_UP>;
drvstr = <GPIO_10MA>;
drvstr = <DRV_TYPE_C>;
oe = <GPIO_OE_DISABLE>;
vm = <GPIO_VM_ENABLE>;
od_en = <GPIO_OD_DISABLE>;
@ -196,8 +196,8 @@
gpio10 {
gpio = <32>;
func = <1>;
pull = <GPIO_NO_PULL>;
drvstr = <GPIO_10MA>;
pull = <GPIO_PULL_UP>;
drvstr = <DRV_TYPE_C>;
oe = <GPIO_OE_DISABLE>;
vm = <GPIO_VM_ENABLE>;
od_en = <GPIO_OD_DISABLE>;

View file

@ -48,9 +48,9 @@
mmc_gpio {
gpio1 {
gpio = <23>;
func = <1>;
func = <1>; /* sdio0 */
pull = <GPIO_PULL_UP>;
drvstr = <GPIO_10MA>;
drvstr = <DRV_TYPE_C>;
oe = <GPIO_OE_DISABLE>;
vm = <GPIO_VM_ENABLE>;
od_en = <GPIO_OD_DISABLE>;
@ -59,9 +59,9 @@
gpio2 {
gpio = <24>;
func = <1>;
func = <1>; /* sdio1 */
pull = <GPIO_PULL_UP>;
drvstr = <GPIO_10MA>;
drvstr = <DRV_TYPE_C>;
oe = <GPIO_OE_DISABLE>;
vm = <GPIO_VM_ENABLE>;
od_en = <GPIO_OD_DISABLE>;
@ -70,9 +70,9 @@
gpio3 {
gpio = <25>;
func = <1>;
func = <1>; /* sdio2 */
pull = <GPIO_PULL_UP>;
drvstr = <GPIO_10MA>;
drvstr = <DRV_TYPE_C>;
oe = <GPIO_OE_DISABLE>;
vm = <GPIO_VM_ENABLE>;
od_en = <GPIO_OD_DISABLE>;
@ -81,9 +81,9 @@
gpio4 {
gpio = <26>;
func = <1>;
func = <1>; /* sdio3 */
pull = <GPIO_PULL_UP>;
drvstr = <GPIO_10MA>;
drvstr = <DRV_TYPE_C>;
oe = <GPIO_OE_DISABLE>;
vm = <GPIO_VM_ENABLE>;
od_en = <GPIO_OD_DISABLE>;
@ -92,9 +92,9 @@
gpio5 {
gpio = <27>;
func = <1>;
func = <1>; /* sdio_clk */
pull = <GPIO_PULL_UP>;
drvstr = <GPIO_16MA>;
drvstr = <DRV_TYPE_A>;
oe = <GPIO_OE_DISABLE>;
vm = <GPIO_VM_ENABLE>;
od_en = <GPIO_OD_DISABLE>;
@ -103,9 +103,9 @@
gpio6 {
gpio = <28>;
func = <1>;
func = <1>; /* sdio_cmd */
pull = <GPIO_PULL_UP>;
drvstr = <GPIO_10MA>;
drvstr = <DRV_TYPE_C>;
oe = <GPIO_OE_DISABLE>;
vm = <GPIO_VM_ENABLE>;
od_en = <GPIO_OD_DISABLE>;

View file

@ -55,6 +55,12 @@
#define GPIO_14MA 6
#define GPIO_16MA 7
/* GPIO TLMM for IPQ40XX: Drive Strength */
#define DRV_TYPE_A 7
#define DRV_TYPE_B 3
#define DRV_TYPE_C 1
#define DRV_TYPE_D 0
/* GPIO TLMM: Status */
#define GPIO_OE_DISABLE 0
#define GPIO_OE_ENABLE 1