diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 67cba0febe..e441aa25e7 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -46,7 +46,9 @@ dtb-$(CONFIG_ARCH_IPQ40xx) += ipq40xx-dk01-c1.dtb \ ipq40xx-dk04-c5.dtb \ ipq40xx-dk07-c1.dtb \ ipq40xx-dk07-c2.dtb \ - ipq40xx-dk07-c3.dtb + ipq40xx-dk07-c3.dtb \ + ipq40xx-dk01-s1.dtb \ + ipq40xx-dk06-c1.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3288-firefly.dtb \ diff --git a/arch/arm/dts/ipq40xx-dk01-c1.dts b/arch/arm/dts/ipq40xx-dk01-c1.dts index 919d29192d..4ed7a01bb0 100644 --- a/arch/arm/dts/ipq40xx-dk01-c1.dts +++ b/arch/arm/dts/ipq40xx-dk01-c1.dts @@ -20,28 +20,6 @@ ess-switch@c000000{ sw_gpio { - gpio1 { - gpio = <52>; - func = <2>; - pull = ; - drvstr = ; - oe = ; - vm = ; - od_en = ; - pu_res = ; - }; - - gpio2 { - gpio = <53>; - func = <2>; - pull = ; - drvstr = ; - oe = ; - vm = ; - od_en = ; - pu_res = ; - }; - gpio3 { gpio = <59>; func = <0>; diff --git a/arch/arm/dts/ipq40xx-dk01-c2.dts b/arch/arm/dts/ipq40xx-dk01-c2.dts index e3ae212773..c2e37051df 100644 --- a/arch/arm/dts/ipq40xx-dk01-c2.dts +++ b/arch/arm/dts/ipq40xx-dk01-c2.dts @@ -19,43 +19,6 @@ spi_nand_available = <1>; config_name = "config@ap.dk01.1-c2"; - ess-switch@c000000{ - sw_gpio { - gpio1 { - gpio = <52>; - func = <2>; - pull = ; - drvstr = ; - oe = ; - vm = ; - od_en = ; - pu_res = ; - }; - - gpio2 { - gpio = <53>; - func = <2>; - pull = ; - drvstr = ; - oe = ; - vm = ; - od_en = ; - pu_res = ; - }; - - gpio3 { - gpio = <62>; - func = <0>; - pull = ; - drvstr = ; - oe = ; - vm = ; - od_en = ; - pu_res = ; - }; - }; - }; - spi { spi0 { cs1 { diff --git a/arch/arm/dts/ipq40xx-dk01-s1.dts b/arch/arm/dts/ipq40xx-dk01-s1.dts new file mode 100644 index 0000000000..1c61a84ac7 --- /dev/null +++ b/arch/arm/dts/ipq40xx-dk01-s1.dts @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2018, The Linux Foundation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/dts-v1/; +#include "ipq40xx-dk01.dtsi" +/ { + machid = <0x8010200>; + ddr_size = <128>; + config_name = "config@ap.dk01.1-c3"; +}; diff --git a/arch/arm/dts/ipq40xx-dk01.dtsi b/arch/arm/dts/ipq40xx-dk01.dtsi index 2f990d325a..96e180ffb1 100644 --- a/arch/arm/dts/ipq40xx-dk01.dtsi +++ b/arch/arm/dts/ipq40xx-dk01.dtsi @@ -46,6 +46,43 @@ status = "ok"; }; + ess-switch@c000000{ + sw_gpio { + gpio1 { + gpio = <52>; + func = <2>; + pull = ; + drvstr = ; + oe = ; + vm = ; + od_en = ; + pu_res = ; + }; + + gpio2 { + gpio = <53>; + func = <2>; + pull = ; + drvstr = ; + oe = ; + vm = ; + od_en = ; + pu_res = ; + }; + + gpio3 { + gpio = <62>; + func = <0>; + pull = ; + drvstr = ; + oe = ; + vm = ; + od_en = ; + pu_res = ; + }; + }; + }; + edma_cfg { unit = <0>; /* Based on the enum for PSGMII phy interface from include/phy.h */ diff --git a/arch/arm/dts/ipq40xx-dk06-c1.dts b/arch/arm/dts/ipq40xx-dk06-c1.dts new file mode 100644 index 0000000000..ec3b9ddab8 --- /dev/null +++ b/arch/arm/dts/ipq40xx-dk06-c1.dts @@ -0,0 +1,284 @@ +/* + * Copyright (c) 2018, The Linux Foundation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/dts-v1/; +#include "ipq40xx-soc.dtsi" +#include +#include "nand_gpio.dtsi" +/ { + model ="QCA, IPQ40xx-DK06"; + compatible = "qca,ipq40xx", "qca,ipq40xx-dk06"; + + machid = <0x8010005>; + ddr_size = <256>; + config_name = "config@ap.dk06.1-c1"; + + aliases { + console = "/serial@78af000"; + xhci0 = "/xhci@8a00000"; + xhci1 = "/xhci@6000000"; + }; + + serial@78af000 { + serial_gpio { + gpio1 { + gpio = <16>; + func = <1>; + pull = ; + oe = ; + }; + + gpio2 { + gpio = <17>; + func = <1>; + pull = ; + oe = ; + }; + }; + }; + + nand@79B0000 { + status = "ok"; + nand_gpio { + gpio18 { + gpio = <61>; + func = <1>; + pull = ; + drvstr = ; + oe = ; + vm = ; + od_en = ; + pu_res = ; + }; + }; + }; + + spi { + status = "ok"; + spi_gpio { + gpio1 { + gpio = <12>; + func = <1>; + pull = ; + drvstr = ; + oe = ; + vm = ; + od_en = ; + pu_res = ; + }; + + gpio2 { + gpio = <13>; + func = <1>; + pull = ; + drvstr = ; + oe = ; + vm = ; + od_en = ; + pu_res = ; + }; + + gpio3 { + gpio = <14>; + func = <1>; + pull = ; + drvstr = ; + oe = ; + vm = ; + od_en = ; + pu_res = ; + }; + + gpio4 { + gpio = <15>; + func = <1>; + pull = ; + drvstr = ; + oe = ; + vm = ; + od_en = ; + pu_res = ; + }; + }; + }; + + sdhci@7824000 { + mmc_gpio { + gpio1 { + gpio = <23>; + func = <1>; + pull = ; + drvstr = ; + oe = ; + vm = ; + od_en = ; + pu_res = ; + }; + + gpio2 { + gpio = <24>; + func = <1>; + pull = ; + drvstr = ; + oe = ; + vm = ; + od_en = ; + pu_res = ; + }; + + gpio3 { + gpio = <25>; + func = <1>; + pull = ; + drvstr = ; + oe = ; + vm = ; + od_en = ; + pu_res = ; + }; + + gpio4 { + gpio = <26>; + func = <1>; + pull = ; + drvstr = ; + oe = ; + vm = ; + od_en = ; + pu_res = ; + }; + + gpio5 { + gpio = <27>; + func = <1>; + pull = ; + drvstr = ; + oe = ; + vm = ; + od_en = ; + pu_res = ; + }; + + gpio6 { + gpio = <28>; + func = <1>; + pull = ; + drvstr = ; + oe = ; + vm = ; + od_en = ; + pu_res = ; + }; + + gpio7 { + gpio = <29>; + func = <1>; + pull = ; + drvstr = ; + oe = ; + vm = ; + od_en = ; + pu_res = ; + }; + + gpio8 { + gpio = <30>; + func = <1>; + pull = ; + drvstr = ; + oe = ; + vm = ; + od_en = ; + pu_res = ; + }; + + gpio9 { + gpio = <31>; + func = <1>; + pull = ; + drvstr = ; + oe = ; + vm = ; + od_en = ; + pu_res = ; + }; + + gpio10 { + gpio = <32>; + func = <1>; + pull = ; + drvstr = ; + oe = ; + vm = ; + od_en = ; + pu_res = ; + }; + }; + }; + + edma_cfg { + unit = <0>; + /* Based on the enum for PSGMII phy interface from include/phy.h */ + phy = <13>; + phy_name = "IPQ MDIO0"; + }; + + ess-switch@c000000{ + sw_gpio { + gpio1 { + gpio = <6>; + func = <1>; + pull = ; + drvstr = ; + oe = ; + vm = ; + od_en = ; + pu_res = ; + }; + + gpio2 { + gpio = <7>; + func = <1>; + pull = ; + drvstr = ; + oe = ; + vm = ; + od_en = ; + pu_res = ; + }; + + gpio3 { + gpio = <19>; + func = <0>; + pull = ; + drvstr = ; + oe = ; + vm = ; + od_en = ; + pu_res = ; + }; + + gpio4 { + gpio = <52>; + func = <0>; + pull = ; + drvstr = ; + oe = ; + vm = ; + od_en = ; + pu_res = ; + }; + }; + }; +}; +