diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index c02952e549..a83e11cb68 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -96,7 +96,9 @@ dtb-$(CONFIG_ARCH_IPQ5332) += ipq5332-emulation.dtb \ ipq5332-mi01.2.dtb \ ipq5332-mi01.4.dtb \ ipq5332-mi01.6.dtb \ - ipq5332-mi01.7.dtb + ipq5332-mi01.7.dtb \ + ipq5332-db-mi01.1.dtb \ + ipq5332-db-mi02.1.dtb dtb-$(CONFIG_ARCH_IPQ6018) += ipq6018-cp01-c1.dtb \ ipq6018-cp02-c1.dtb \ diff --git a/arch/arm/dts/ipq5332-db-mi01.2.dts b/arch/arm/dts/ipq5332-db-mi01.1.dts similarity index 92% rename from arch/arm/dts/ipq5332-db-mi01.2.dts rename to arch/arm/dts/ipq5332-db-mi01.1.dts index af3d0619c5..7733e4bf24 100644 --- a/arch/arm/dts/ipq5332-db-mi01.2.dts +++ b/arch/arm/dts/ipq5332-db-mi01.1.dts @@ -17,7 +17,7 @@ #include "ipq5332-soc.dtsi" / { machid = <0x1060001>; - config_name = "config@db-mi01.2"; + config_name = "config@db-mi01.1"; aliases { console = "/serial@78AF000"; @@ -35,13 +35,14 @@ blsp0_uart_rx { gpio = <18>; func = <1>; - pull = ; + pull = ; drvstr = ; }; blsp0_uart_tx { gpio = <19>; func = <1>; drvstr = ; + pull = ; }; }; }; @@ -52,31 +53,37 @@ qspi_dat3 { gpio = <8>; func = <2>; + pull = ; drvstr = ; }; qspi_dat2 { gpio = <9>; func = <2>; + pull = ; drvstr = ; }; qspi_dat1 { gpio = <10>; func = <2>; + pull = ; drvstr = ; }; qspi_dat0 { gpio = <11>; func = <2>; + pull = ; drvstr = ; }; qspi_cs_n { gpio = <12>; func = <2>; + pull = ; drvstr = ; }; qspi_clk { gpio = <13>; func = <2>; + pull = ; drvstr = ; }; }; diff --git a/arch/arm/dts/ipq5332-db-mi02.1.dts b/arch/arm/dts/ipq5332-db-mi02.1.dts index 0de686bd68..72c227da17 100644 --- a/arch/arm/dts/ipq5332-db-mi02.1.dts +++ b/arch/arm/dts/ipq5332-db-mi02.1.dts @@ -35,12 +35,13 @@ blsp0_uart_rx { gpio = <18>; func = <1>; - pull = ; + pull = ; drvstr = ; }; blsp0_uart_tx { gpio = <19>; func = <1>; + pull = ; drvstr = ; }; }; @@ -52,31 +53,37 @@ qspi_dat3 { gpio = <8>; func = <2>; + pull = ; drvstr = ; }; qspi_dat2 { gpio = <9>; func = <2>; + pull = ; drvstr = ; }; qspi_dat1 { gpio = <10>; func = <2>; + pull = ; drvstr = ; }; qspi_dat0 { gpio = <11>; func = <2>; + pull = ; drvstr = ; }; qspi_cs_n { gpio = <12>; func = <2>; + pull = ; drvstr = ; }; qspi_clk { gpio = <13>; func = <2>; + pull = ; drvstr = ; }; }; diff --git a/arch/arm/dts/ipq5332-mi01.1.dts b/arch/arm/dts/ipq5332-mi01.1.dts index 97cc91da17..51f655ead6 100644 --- a/arch/arm/dts/ipq5332-mi01.1.dts +++ b/arch/arm/dts/ipq5332-mi01.1.dts @@ -29,16 +29,18 @@ }; serial@78AF000 { + status = "ok"; serial_gpio { blsp0_uart_rx { gpio = <18>; func = <1>; - pull = ; + pull = ; drvstr = ; }; blsp0_uart_tx { gpio = <19>; func = <1>; + pull = ; drvstr = ; }; }; @@ -47,25 +49,29 @@ spi { spi_gpio { blsp0_spi_clk { - gpio = <33>; + gpio = <14>; func = <1>; + pull = ; oe = ; drvstr = ; }; blsp0_spi_mosi { - gpio = <34>; + gpio = <15>; func = <1>; + pull = ; oe = ; drvstr = ; }; blsp0_spi_miso { - gpio = <35>; + gpio = <16>; func = <1>; + pull = ; drvstr = ; }; blsp0_spi_cs { - gpio = <36>; + gpio = <17>; func = <1>; + pull = ; oe = ; drvstr = ; }; @@ -98,31 +104,37 @@ qspi_dat3 { gpio = <8>; func = <2>; + pull = ; drvstr = ; }; qspi_dat2 { gpio = <9>; func = <2>; + pull = ; drvstr = ; }; qspi_dat1 { gpio = <10>; func = <2>; + pull = ; drvstr = ; }; qspi_dat0 { gpio = <11>; func = <2>; + pull = ; drvstr = ; }; qspi_cs_n { gpio = <12>; func = <2>; + pull = ; drvstr = ; }; qspi_clk { gpio = <13>; func = <2>; + pull = ; drvstr = ; }; }; diff --git a/arch/arm/dts/ipq5332-mi01.2.dts b/arch/arm/dts/ipq5332-mi01.2.dts index 4e64b7b1d0..48e0831b68 100644 --- a/arch/arm/dts/ipq5332-mi01.2.dts +++ b/arch/arm/dts/ipq5332-mi01.2.dts @@ -35,40 +35,13 @@ blsp0_uart_rx { gpio = <18>; func = <1>; - pull = ; + pull = ; drvstr = ; }; blsp0_uart_tx { gpio = <19>; func = <1>; - drvstr = ; - }; - }; - }; - - spi { - spi_gpio { - blsp0_spi_clk { - gpio = <33>; - func = <1>; - oe = ; - drvstr = ; - }; - blsp0_spi_mosi { - gpio = <34>; - func = <1>; - oe = ; - drvstr = ; - }; - blsp0_spi_miso { - gpio = <35>; - func = <1>; - drvstr = ; - }; - blsp0_spi_cs { - gpio = <36>; - func = <1>; - oe = ; + pull = ; drvstr = ; }; }; @@ -100,31 +73,37 @@ qspi_dat3 { gpio = <8>; func = <2>; + pull = ; drvstr = ; }; qspi_dat2 { gpio = <9>; func = <2>; + pull = ; drvstr = ; }; qspi_dat1 { gpio = <10>; func = <2>; + pull = ; drvstr = ; }; qspi_dat0 { gpio = <11>; func = <2>; + pull = ; drvstr = ; }; qspi_cs_n { gpio = <12>; func = <2>; + pull = ; drvstr = ; }; qspi_clk { gpio = <13>; func = <2>; + pull = ; drvstr = ; }; }; diff --git a/arch/arm/dts/ipq5332-mi01.4.dts b/arch/arm/dts/ipq5332-mi01.4.dts index 3a2494240f..2a2e5270d6 100644 --- a/arch/arm/dts/ipq5332-mi01.4.dts +++ b/arch/arm/dts/ipq5332-mi01.4.dts @@ -34,40 +34,13 @@ blsp0_uart_rx { gpio = <18>; func = <1>; - pull = ; + pull = ; drvstr = ; }; blsp0_uart_tx { gpio = <19>; func = <1>; - drvstr = ; - }; - }; - }; - - spi { - spi_gpio { - blsp0_spi_clk { - gpio = <33>; - func = <1>; - oe = ; - drvstr = ; - }; - blsp0_spi_mosi { - gpio = <34>; - func = <1>; - oe = ; - drvstr = ; - }; - blsp0_spi_miso { - gpio = <35>; - func = <1>; - drvstr = ; - }; - blsp0_spi_cs { - gpio = <36>; - func = <1>; - oe = ; + pull = ; drvstr = ; }; }; @@ -99,31 +72,37 @@ qspi_dat3 { gpio = <8>; func = <2>; + pull = ; drvstr = ; }; qspi_dat2 { gpio = <9>; func = <2>; + pull = ; drvstr = ; }; qspi_dat1 { gpio = <10>; func = <2>; + pull = ; drvstr = ; }; qspi_dat0 { gpio = <11>; func = <2>; + pull = ; drvstr = ; }; qspi_cs_n { gpio = <12>; func = <2>; + pull = ; drvstr = ; }; qspi_clk { gpio = <13>; func = <2>; + pull = ; drvstr = ; }; };