diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-04-14 22:29:36 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-04-14 22:29:38 +0200 |
| commit | 7e8298565d83ab79dc9a3f05da01b4515d0d52f9 (patch) | |
| tree | c4fc6f0604939dc0b67787b3f34509b5c22a8039 /arch | |
| parent | 718acce6f05df397092da870f3e77dfc12ac196c (diff) | |
| parent | 6154a79fdcb3b80fb91c25b4528df18c538f080d (diff) | |
| download | linux-7e8298565d83ab79dc9a3f05da01b4515d0d52f9.tar.gz linux-7e8298565d83ab79dc9a3f05da01b4515d0d52f9.tar.bz2 linux-7e8298565d83ab79dc9a3f05da01b4515d0d52f9.zip | |
Merge tag 'v6.3-next-dts32' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into soc/dt
mt7623:
Disable not exising home key
mt2701:
change node name to match DT bindings
* tag 'v6.3-next-dts32' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
arm: dts: mt7623: disable home key on Bananapi BPI-R2
arm: dts: mediatek: Fix existing NAND controller node name
Link: https://lore.kernel.org/r/c3b17357-e08d-da7e-def0-a7f9e0b95cb7@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/mt2701.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi index 0a0fe8c5a405..ce6a4015fed5 100644 --- a/arch/arm/boot/dts/mt2701.dtsi +++ b/arch/arm/boot/dts/mt2701.dtsi @@ -359,7 +359,7 @@ mediatek,apmixedsys = <&apmixedsys>; }; - nandc: nfi@1100d000 { + nandc: nand-controller@1100d000 { compatible = "mediatek,mt2701-nfc"; reg = <0 0x1100d000 0 0x1000>; interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_LOW>; diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts index 5008115d2494..ece61a6a7a89 100644 --- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts +++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts @@ -322,6 +322,12 @@ vqmmc-supply = <®_3p3v>; }; +&mt6323keys { + home { + status = "disabled"; + }; +}; + &mt6323_leds { status = "okay"; |