diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2022-05-03 11:53:42 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2022-05-03 11:53:42 +0200 |
| commit | b812f646bb818ca0e1806072eb7f0006f3a65dde (patch) | |
| tree | 3ba2134dcefd8127f5ad286e0fe1135588fbd0b3 /arch/arm/boot/dts/at91-sama7g5ek.dts | |
| parent | a5fc012e6ee75a899173398573e77207542f588a (diff) | |
| parent | e954d2c94d007afe487044ecfa48f2518643df0e (diff) | |
| download | linux-b812f646bb818ca0e1806072eb7f0006f3a65dde.tar.gz | |
Merge drm/drm-next into drm-misc-next
Christian needs a backmerge to avoid a merge conflict for amdgpu.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'arch/arm/boot/dts/at91-sama7g5ek.dts')
| -rw-r--r-- | arch/arm/boot/dts/at91-sama7g5ek.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/at91-sama7g5ek.dts b/arch/arm/boot/dts/at91-sama7g5ek.dts index 08685a10eda1..d83f76a6cd6a 100644 --- a/arch/arm/boot/dts/at91-sama7g5ek.dts +++ b/arch/arm/boot/dts/at91-sama7g5ek.dts @@ -495,7 +495,7 @@ pinctrl_flx3_default: flx3_default { pinmux = <PIN_PD16__FLEXCOM3_IO0>, <PIN_PD17__FLEXCOM3_IO1>; - bias-disable; + bias-pull-up; }; pinctrl_flx4_default: flx4_default { @@ -655,7 +655,7 @@ <PIN_PB21__QSPI0_INT>; bias-disable; slew-rate = <0>; - atmel,drive-strength = <ATMEL_PIO_DRVSTR_HI>; + atmel,drive-strength = <ATMEL_PIO_DRVSTR_ME>; }; pinctrl_sdmmc0_default: sdmmc0_default { |