github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-08-02 05:12:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

mvebu dt64 for 6.6 (part 1)

Browse Source 
Add the NAND Flash Controller on the AC5/AC5X SOC device tree
 Fix style issue
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQQYqXDMF3cvSLY+g9cLBhiOFHI71QUCZNekOAAKCRALBhiOFHI7
 1R8/AKCD9XFuQvGMfQwOXwXZPid3XfTQdgCgpN4VE28m8CJLuqww7rjdM1xZaRI=
 =cCrk
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmTaX2EACgkQYKtH/8kJ
 UieETBAAqkZ6cuolx4vFbmHaejPJ9cKwg51Lk2AOqiuxvJTjf8oRhOdnaDCFNL0B
 KncUoimtJYXMhoq+lUZeHdNntTmPzaz6OJg/3Q0P4tm/+8VzLjFwdF54n+E7U/YU
 tXIbKLNavfeSbq8R4vvIl4rWbLDCZ1+NZ3sVT2gf6EYZxpA1MFlJ8gKgCXVgAjTk
 8uRGRr6zr8DW+1HC3tpePZXZ8qXedMDQb5JlBMzArQkhDsbgPWjMWSoNcBCXOIn6
 nm3KOD9W/HtluZWxC7zgqN1X0B1rTbtgSiSL1+6+KAq5j1qpgDdyfdrnNsdPMt5o
 d15u78RN9JZmWHnDGfX1ZD9JOtgASIfgWYIJSFMq1AP54HL2fSD5PSOcY6+0xa75
 F+g28rVprCi6HuqJ1WHl2qmB2CVKlE56glVvW/K4/fXyfwyTJJmtB6bow3vN7pZ9
 pW54xBsReiNeDHnBnRBT57ygtyekD35SJszocbz73Z441CMwRbLKY+OYWFWr9+Wr
 532MODDC5IxirZl/VCO62pg5Aso87eWIdnZ+p1hIds5fcnbTXKbsYt5R0GqJ+dMT
 5EfsVfi60swmb30ub/5Vyi8+40IRtHaXIGsCOm+nqnbZwsxMtcPXgJ9kA3o8Cmb5
 gdhHvyzbBpZ1oM6MF8CIlYsWDfpJkv+I+6NLefFoizWyBrOhxlM=
 =h8gM
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-dt64-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/dt

mvebu dt64 for 6.6 (part 1)

Add the NAND Flash Controller on the AC5/AC5X SOC device tree
Fix style issue

* tag 'mvebu-dt64-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  arm64: dts: marvell: Add NAND flash controller to AC5
  arm64: dts: marvell: add missing space before {

Link: https://lore.kernel.org/r/87edk8t0kl.fsf@BL-laptop
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-08-14 19:07:44 +02:00
commit 7cb74e0c66
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
View File

@ -135,7 +135,7 @@ mdio: mdio@22004 {
clocks = <&cnm_clock>;
};
i2c0: i2c@11000{
i2c0: i2c@11000 {
compatible = "marvell,mv78230-i2c";
reg = <0x11000 0x20>;
#address-cells = <1>;
@ -154,7 +154,7 @@ i2c0: i2c@11000{
status = "disabled";
};
i2c1: i2c@11100{
i2c1: i2c@11100 {
compatible = "marvell,mv78230-i2c";
reg = <0x11100 0x20>;
#address-cells = <1>;
@ -297,6 +297,16 @@ spi1: spi@805a8000 {
status = "disabled";
};
nand: nand-controller@805b0000 {
compatible = "marvell,ac5-nand-controller";
reg = <0x0 0x805b0000 0x0 0x00000054>;
#address-cells = <0x1>;
#size-cells = <0x0>;
interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&nand_clock>;
status = "disabled";
};
gic: interrupt-controller@80600000 {
compatible = "arm,gic-v3";
#interrupt-cells = <3>;
@ -319,5 +329,11 @@ spi_clock: spi-clock {
#clock-cells = <0>;
clock-frequency = <200000000>;
};
nand_clock: nand-clock {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <400000000>;
};
};
};

2
arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
View File

@ -149,7 +149,7 @@ &cp0_spi0 {
};
/* SPI-NOR */
&cp0_spi1{
&cp0_spi1 {
status = "okay";
pinctrl-names = "default";