Author: nbd Date: 2016-01-17 20:56:03 +0100 (Sun, 17 Jan 2016) New Revision: 48293
Modified: trunk/target/linux/lantiq/dts/DGN1000B.dts trunk/target/linux/lantiq/dts/DGN3500.dtsi trunk/target/linux/lantiq/dts/EASY80920.dtsi trunk/target/linux/lantiq/dts/FRITZ3370.dts trunk/target/linux/lantiq/dts/TDW89X0.dtsi trunk/target/linux/lantiq/dts/amazonse.dtsi trunk/target/linux/lantiq/dts/ar9.dtsi trunk/target/linux/lantiq/dts/vr9.dtsi trunk/target/linux/lantiq/xrx200/config-default trunk/target/linux/lantiq/xway/config-default Log: lantiq: Switch to the new SPI driver Compared to the "old" driver: - Each device must assign a pinctrl setting to the SPI node to allow the new SPI driver to configure the SPI pins. While here we are also using separate input and output settings so we are independent of whether the bootloader configures the pins correctly. - We use the new "compatible" strings to make the driver choose the correct number of chip-selects for each SoC. - The new driver starts counting the chip-selects at 1 (instead of 0, like the old one did). Thus we have to adjust the devices accordingly. Signed-off-by: Martin Blumenstingl <[email protected]> Modified: trunk/target/linux/lantiq/dts/DGN1000B.dts =================================================================== --- trunk/target/linux/lantiq/dts/DGN1000B.dts 2016-01-17 19:55:55 UTC (rev 48292) +++ trunk/target/linux/lantiq/dts/DGN1000B.dts 2016-01-17 19:56:03 UTC (rev 48293) @@ -28,10 +28,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - spi { - lantiq,groups = "spi", "spi_cs1"; - lantiq,function = "spi"; - }; asc { lantiq,groups = "asc"; lantiq,function = "asc"; @@ -42,6 +38,18 @@ lantiq,open-drain = <1>; }; }; + pins_spi_default: pins_spi_default { + spi_in { + lantiq,groups = "spi_di"; + lantiq,function = "spi"; + }; + spi_out { + lantiq,groups = "spi_do", "spi_clk", + "spi_cs1"; + lantiq,function = "spi"; + lantiq,output = <1>; + }; + }; }; etop@E180000 { @@ -50,11 +58,14 @@ }; spi@E100800 { - m25p80@0 { + pinctrl-names = "default"; + pinctrl-0 = <&pins_spi_default>; + + m25p80@1 { #address-cells = <1>; #size-cells = <1>; compatible = "jedec,spi-nor"; - reg = <0 0>; + reg = <1 0>; spi-max-frequency = <5000000>; partition@0 { Modified: trunk/target/linux/lantiq/dts/DGN3500.dtsi =================================================================== --- trunk/target/linux/lantiq/dts/DGN3500.dtsi 2016-01-17 19:55:55 UTC (rev 48292) +++ trunk/target/linux/lantiq/dts/DGN3500.dtsi 2016-01-17 19:56:03 UTC (rev 48293) @@ -45,10 +45,18 @@ lantiq,output = <1>; lantiq,pull = <0>; }; - spi { - lantiq,groups = "spi", "spi_cs4"; + }; + pins_spi_default: pins_spi_default { + spi_in { + lantiq,groups = "spi_di"; lantiq,function = "spi"; }; + spi_out { + lantiq,groups = "spi_do", "spi_clk", + "spi_cs4"; + lantiq,function = "spi"; + lantiq,output = <1>; + }; }; }; @@ -150,13 +158,16 @@ }; &spi { + pinctrl-names = "default"; + pinctrl-0 = <&pins_spi_default>; + status = "ok"; - m25p80@3 { + m25p80@4 { #address-cells = <1>; #size-cells = <1>; compatible = "jedec,spi-nor"; - reg = <3 0>; + reg = <4 0>; spi-max-frequency = <1000000>; partition@0 { Modified: trunk/target/linux/lantiq/dts/EASY80920.dtsi =================================================================== --- trunk/target/linux/lantiq/dts/EASY80920.dtsi 2016-01-17 19:55:55 UTC (rev 48292) +++ trunk/target/linux/lantiq/dts/EASY80920.dtsi 2016-01-17 19:56:03 UTC (rev 48293) @@ -53,10 +53,6 @@ lantiq,groups = "stp"; lantiq,function = "stp"; }; - spi { - lantiq,groups = "spi", "spi_cs4"; - lantiq,function = "spi"; - }; nand { lantiq,groups = "nand cle", "nand ale", "nand rd", "nand rdy"; @@ -90,6 +86,18 @@ lantiq,pull = <2>; }; }; + pins_spi_default: pins_spi_default { + spi_in { + lantiq,groups = "spi_di"; + lantiq,function = "spi"; + }; + spi_out { + lantiq,groups = "spi_do", "spi_clk", + "spi_cs4"; + lantiq,function = "spi"; + lantiq,output = <1>; + }; + }; }; eth@E108000 { @@ -297,13 +305,16 @@ }; &spi { + pinctrl-names = "default"; + pinctrl-0 = <&pins_spi_default>; + status = "ok"; - m25p80@3 { + m25p80@4 { #address-cells = <1>; #size-cells = <1>; compatible = "jedec,spi-nor"; - reg = <3 0>; + reg = <4 0>; spi-max-frequency = <1000000>; partition@0 { Modified: trunk/target/linux/lantiq/dts/FRITZ3370.dts =================================================================== --- trunk/target/linux/lantiq/dts/FRITZ3370.dts 2016-01-17 19:55:55 UTC (rev 48292) +++ trunk/target/linux/lantiq/dts/FRITZ3370.dts 2016-01-17 19:56:03 UTC (rev 48293) @@ -66,10 +66,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - spi { - lantiq,groups = "spi", "spi_cs4"; - lantiq,function = "spi"; - }; mdio { lantiq,groups = "mdio"; lantiq,function = "mdio"; @@ -92,6 +88,18 @@ lantiq,output = <1>; }; }; + pins_spi_default: pins_spi_default { + spi_in { + lantiq,groups = "spi_di"; + lantiq,function = "spi"; + }; + spi_out { + lantiq,groups = "spi_do", "spi_clk", + "spi_cs4"; + lantiq,function = "spi"; + lantiq,output = <1>; + }; + }; }; eth@E108000 { @@ -239,13 +247,16 @@ }; &spi { + pinctrl-names = "default"; + pinctrl-0 = <&pins_spi_default>; + status = "ok"; - m25p80@3 { + m25p80@4 { #address-cells = <1>; #size-cells = <1>; compatible = "jedec,spi-nor"; - reg = <3 0>; + reg = <4 0>; spi-max-frequency = <1000000>; ath9k_cal: partition@0 { Modified: trunk/target/linux/lantiq/dts/TDW89X0.dtsi =================================================================== --- trunk/target/linux/lantiq/dts/TDW89X0.dtsi 2016-01-17 19:55:55 UTC (rev 48292) +++ trunk/target/linux/lantiq/dts/TDW89X0.dtsi 2016-01-17 19:56:03 UTC (rev 48293) @@ -43,16 +43,24 @@ lantiq,open-drain = <0>; lantiq,output = <1>; }; - spi { - lantiq,groups = "spi", "spi_cs4"; - lantiq,function = "spi"; - }; pcie-rst { lantiq,pins = "io38"; lantiq,pull = <0>; lantiq,output = <1>; }; }; + pins_spi_default: pins_spi_default { + spi_in { + lantiq,groups = "spi_di"; + lantiq,function = "spi"; + }; + spi_out { + lantiq,groups = "spi_do", "spi_clk", + "spi_cs4"; + lantiq,function = "spi"; + lantiq,output = <1>; + }; + }; }; eth@E108000 { @@ -211,13 +219,16 @@ }; &spi { + pinctrl-names = "default"; + pinctrl-0 = <&pins_spi_default>; + status = "ok"; - m25p80@3 { + m25p80@4 { #address-cells = <1>; #size-cells = <1>; compatible = "jedec,spi-nor"; - reg = <3 0>; + reg = <4 0>; spi-max-frequency = <33250000>; m25p,fast-read; Modified: trunk/target/linux/lantiq/dts/amazonse.dtsi =================================================================== --- trunk/target/linux/lantiq/dts/amazonse.dtsi 2016-01-17 19:55:55 UTC (rev 48292) +++ trunk/target/linux/lantiq/dts/amazonse.dtsi 2016-01-17 19:56:03 UTC (rev 48293) @@ -73,10 +73,12 @@ reg = <0x10000000 0xEF00000>; spi@E100800 { - compatible = "lantiq,spi-xway"; + compatible = "lantiq,ase-spi"; reg = <0xE100800 0x100>; interrupt-parent = <&icu0>; interrupts = <24 25 26>; + interrupt-names = "spi_rx", "spi_tx", "spi_err", + "spi_frm"; #address-cells = <1>; #size-cells = <1>; }; Modified: trunk/target/linux/lantiq/dts/ar9.dtsi =================================================================== --- trunk/target/linux/lantiq/dts/ar9.dtsi 2016-01-17 19:55:55 UTC (rev 48292) +++ trunk/target/linux/lantiq/dts/ar9.dtsi 2016-01-17 19:56:03 UTC (rev 48293) @@ -101,10 +101,12 @@ }; spi: spi@E100800 { - compatible = "lantiq,spi-xway"; + compatible = "lantiq,xrx100-spi"; reg = <0xE100800 0x100>; interrupt-parent = <&icu0>; interrupts = <22 23 24>; + interrupt-names = "spi_rx", "spi_tx", "spi_err", + "spi_frm"; #address-cells = <1>; #size-cells = <1>; status = "disabled"; Modified: trunk/target/linux/lantiq/dts/vr9.dtsi =================================================================== --- trunk/target/linux/lantiq/dts/vr9.dtsi 2016-01-17 19:55:55 UTC (rev 48292) +++ trunk/target/linux/lantiq/dts/vr9.dtsi 2016-01-17 19:56:03 UTC (rev 48293) @@ -113,10 +113,12 @@ }; spi: spi@E100800 { - compatible = "lantiq,spi-xway"; + compatible = "lantiq,xrx200-spi"; reg = <0xE100800 0x100>; interrupt-parent = <&icu0>; interrupts = <22 23 24>; + interrupt-names = "spi_rx", "spi_tx", "spi_err", + "spi_frm"; #address-cells = <1>; #size-cells = <1>; status = "disabled"; Modified: trunk/target/linux/lantiq/xrx200/config-default =================================================================== --- trunk/target/linux/lantiq/xrx200/config-default 2016-01-17 19:55:55 UTC (rev 48292) +++ trunk/target/linux/lantiq/xrx200/config-default 2016-01-17 19:56:03 UTC (rev 48293) @@ -56,9 +56,8 @@ CONFIG_RTL8367B_PHY=y CONFIG_RTL8367_PHY=y CONFIG_SPI=y -CONFIG_SPI_BITBANG=y +CONFIG_SPI_LANTIQ=y CONFIG_SPI_MASTER=y -CONFIG_SPI_XWAY=y CONFIG_SYS_SUPPORTS_MIPS16=y CONFIG_UBIFS_FS=y CONFIG_UBIFS_FS_ADVANCED_COMPR=y Modified: trunk/target/linux/lantiq/xway/config-default =================================================================== --- trunk/target/linux/lantiq/xway/config-default 2016-01-17 19:55:55 UTC (rev 48292) +++ trunk/target/linux/lantiq/xway/config-default 2016-01-17 19:56:03 UTC (rev 48293) @@ -54,9 +54,8 @@ CONFIG_RTL8367B_PHY=y CONFIG_RTL8367_PHY=y CONFIG_SPI=y -CONFIG_SPI_BITBANG=y +CONFIG_SPI_LANTIQ=y CONFIG_SPI_MASTER=y -CONFIG_SPI_XWAY=y CONFIG_SYS_SUPPORTS_MIPS16=y CONFIG_UBIFS_FS=y CONFIG_UBIFS_FS_ADVANCED_COMPR=y _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
