diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-01-19 05:41:43 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-01-19 05:41:43 +0100 |
| commit | a0633c4cbc3c06c4e6de0505e02a9585020b3497 (patch) | |
| tree | 3784abccebad9a596bd3eac3f72d883d97ba6714 /dts/src/arm/am335x-igep0033.dtsi | |
| parent | d595653acba82fde36f67c86b88109decd09ddab (diff) | |
| parent | 89b195969ec4dd07c7a8dfbd2f3f1eb83ead4c16 (diff) | |
| download | barebox-a0633c4cbc3c06c4e6de0505e02a9585020b3497.tar.gz barebox-a0633c4cbc3c06c4e6de0505e02a9585020b3497.tar.xz | |
Merge branch 'for-next/dts'
Diffstat (limited to 'dts/src/arm/am335x-igep0033.dtsi')
| -rw-r--r-- | dts/src/arm/am335x-igep0033.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dts/src/arm/am335x-igep0033.dtsi b/dts/src/arm/am335x-igep0033.dtsi index c9f354fc98..7ec23d47a4 100644 --- a/dts/src/arm/am335x-igep0033.dtsi +++ b/dts/src/arm/am335x-igep0033.dtsi @@ -70,7 +70,7 @@ AM33XX_PADCONF(AM335X_PIN_GPMC_AD6, PIN_INPUT_PULLUP, MUX_MODE0) AM33XX_PADCONF(AM335X_PIN_GPMC_AD7, PIN_INPUT_PULLUP, MUX_MODE0) AM33XX_PADCONF(AM335X_PIN_GPMC_WAIT0, PIN_INPUT_PULLUP, MUX_MODE0) - AM33XX_PADCONF(AM335X_PIN_GPMC_WPN, PIN_INPUT_PULLUP, MUX_MODE7) /* gpmc_wpn.gpio0_30 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_WPN, PIN_INPUT_PULLUP, MUX_MODE7) /* gpmc_wpn.gpio0_31 */ AM33XX_PADCONF(AM335X_PIN_GPMC_CSN0, PIN_OUTPUT, MUX_MODE0) AM33XX_PADCONF(AM335X_PIN_GPMC_ADVN_ALE, PIN_OUTPUT, MUX_MODE0) AM33XX_PADCONF(AM335X_PIN_GPMC_OEN_REN, PIN_OUTPUT, MUX_MODE0) |