diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-04-08 18:35:52 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-04-08 18:35:52 +0300 |
| commit | 974be36e1ca987a1940eb6894a2b5bb631049791 (patch) | |
| tree | 2298724108c06424d29e849dda389b8a7a8763a2 /arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts | |
| parent | e49d033bddf5b565044e2abe4241353959bc9120 (diff) | |
| parent | 7a2f6e69e9c1060a7a09c1f8322ccb8d942b3078 (diff) | |
| download | linux-974be36e1ca987a1940eb6894a2b5bb631049791.tar.xz | |
Merge tag 'sunxi-fixes-for-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes
One 32kHz clock fix for the beelink gs1, a CD polarity fix for the SoPine, some
MAINTAINERS maintainance, and a clk / reset switch to our headers.
* tag 'sunxi-fixes-for-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
arm64: dts: allwinner: h6: beelink-gs1: Remove ext. 32 kHz osc reference
MAINTAINERS: Match on allwinner keyword
MAINTAINERS: Add our new mailing-list
arm64: dts: allwinner: Fix SD card CD GPIO for SOPine systems
arm64: dts: allwinner: h6: Switch to macros for RSB clock/reset indices
Link: https://lore.kernel.org/r/9972a85e-60b7-49f4-a246-db3396dd4764.lettre@localhost
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts')
| -rw-r--r-- | arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts index 437ffe3628a5..e79ce49e7e6a 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts @@ -19,3 +19,7 @@ }; }; }; + +&mmc0 { + cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 push-push switch */ +}; |