devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
  • * [PATCH 2/5] ARM: dts: zynq: Add pinctrl to Parallella
           [not found] <1423702513-4032-1-git-send-email-afaerber@suse.de>
           [not found] ` <1423702513-4032-1-git-send-email-afaerber-l3A5Bk7waGM@public.gmane.org>
    @ 2015-02-12  0:55 ` Andreas Färber
      2015-02-12  0:55 ` [PATCH 3/5] ARM: dts: zynq: Add LED for Parallella Andreas Färber
                       ` (2 subsequent siblings)
      4 siblings, 0 replies; 6+ messages in thread
    From: Andreas Färber @ 2015-02-12  0:55 UTC (permalink / raw)
      To: Michal Simek
      Cc: Olof Johansson, Sören Brinkmann, linux-arm-kernel,
    	Andreas Olofsson, Ola Jeppsson, Matteo Vit, Sean Rickerd,
    	Andreas Färber, Rob Herring, Pawel Moll, Mark Rutland,
    	Ian Campbell, Kumar Gala, Russell King,
    	open list:OPEN FIRMWARE AND..., open list
    
    Signed-off-by: Andreas Färber <afaerber@suse.de>
    ---
     arch/arm/boot/dts/zynq-parallella1.dtsi | 118 ++++++++++++++++++++++++++++++++
     1 file changed, 118 insertions(+)
    
    diff --git a/arch/arm/boot/dts/zynq-parallella1.dtsi b/arch/arm/boot/dts/zynq-parallella1.dtsi
    index 7c1206f928bc..e77a4968fe17 100644
    --- a/arch/arm/boot/dts/zynq-parallella1.dtsi
    +++ b/arch/arm/boot/dts/zynq-parallella1.dtsi
    @@ -47,6 +47,8 @@
     	status = "okay";
     	phy-mode = "rgmii-id";
     	phy-handle = <&ethernet_phy>;
    +	pinctrl-names = "default";
    +	pinctrl-0 = <&pinctrl_gem0_default>;
     
     	ethernet_phy: ethernet-phy@0 {
     		/* Marvell 88E1318 */
    @@ -58,6 +60,11 @@
     	};
     };
     
    +&gpio0 {
    +	pinctrl-names = "default";
    +	pinctrl-0 = <&pinctrl_gpio0_default>;
    +};
    +
     &i2c0 {
     	status = "okay";
     
    @@ -85,10 +92,121 @@
     	};
     };
     
    +&pinctrl0 {
    +	pinctrl_gem0_default: gem0-default {
    +		mux {
    +			function = "ethernet0";
    +			groups = "ethernet0_0_grp";
    +		};
    +
    +		conf {
    +			groups = "ethernet0_0_grp";
    +			slew-rate = <0>;
    +			io-standard = <1>;
    +		};
    +
    +		conf-rx {
    +			pins = "MIO22", "MIO23", "MIO24", "MIO25", "MIO26", "MIO27";
    +			bias-high-impedance;
    +			low-power-disable;
    +		};
    +
    +		conf-tx {
    +			pins = "MIO16", "MIO17", "MIO18", "MIO19", "MIO20", "MIO21";
    +			bias-disable;
    +			low-power-enable;
    +		};
    +
    +		mux-mdio {
    +			function = "mdio0";
    +			groups = "mdio0_0_grp";
    +		};
    +
    +		conf-mdio {
    +			groups = "mdio0_0_grp";
    +			slew-rate = <0>;
    +			io-standard = <1>;
    +			bias-disable;
    +		};
    +	};
    +
    +	pinctrl_gpio0_default: gpio0-default {
    +		mux {
    +			function = "gpio0";
    +			groups = "gpio0_7_grp";
    +		};
    +
    +		conf {
    +			groups = "gpio0_7_grp";
    +			slew-rate = <0>;
    +			io-standard = <3>;
    +		};
    +
    +		conf-pull-up {
    +			pins = "MIO7";
    +			bias-pull-up;
    +		};
    +	};
    +
    +	pinctrl_sdhci1_default: sdhci1-default {
    +		mux {
    +			function = "sdio1";
    +			groups = "sdio1_0_grp";
    +		};
    +
    +		conf {
    +			groups = "sdio1_0_grp";
    +			slew-rate = <0>;
    +			io-standard = <1>;
    +			bias-disable;
    +		};
    +
    +		mux-cd {
    +			function = "sdio1_cd";
    +			groups = "gpio0_0_grp";
    +		};
    +
    +		conf-cd {
    +			groups = "gpio0_0_grp";
    +			bias-high-impedance;
    +			bias-pull-up;
    +			slew-rate = <0>;
    +			io-standard = <3>;
    +		};
    +	};
    +
    +	pinctrl_uart1_default: uart1-default {
    +		mux {
    +			function = "uart1";
    +			groups = "uart1_0_grp";
    +		};
    +
    +		conf {
    +			groups = "uart1_0_grp";
    +			slew-rate = <0>;
    +			io-standard = <3>;
    +		};
    +
    +		conf-rx {
    +			pins = "MIO9";
    +			bias-high-impedance;
    +		};
    +
    +		conf-tx {
    +			pins = "MIO8";
    +			bias-disable = <0>;
    +		};
    +	};
    +};
    +
     &sdhci1 {
     	status = "okay";
    +	pinctrl-names = "default";
    +	pinctrl-0 = <&pinctrl_sdhci1_default>;
     };
     
     &uart1 {
     	status = "okay";
    +	pinctrl-names = "default";
    +	pinctrl-0 = <&pinctrl_uart1_default>;
     };
    -- 
    2.2.2
    
    ^ permalink raw reply related	[flat|nested] 6+ messages in thread
  • * [PATCH 3/5] ARM: dts: zynq: Add LED for Parallella
           [not found] <1423702513-4032-1-git-send-email-afaerber@suse.de>
           [not found] ` <1423702513-4032-1-git-send-email-afaerber-l3A5Bk7waGM@public.gmane.org>
      2015-02-12  0:55 ` [PATCH 2/5] ARM: dts: zynq: Add pinctrl to Parallella Andreas Färber
    @ 2015-02-12  0:55 ` Andreas Färber
      2015-02-12  0:55 ` [PATCH 4/5] ARM: dts: zynq: Split off Parallella Microserver device tree Andreas Färber
      2015-02-12  0:55 ` [PATCH 5/5] ARM: dts: zynq: Add USB for Parallella Andreas Färber
      4 siblings, 0 replies; 6+ messages in thread
    From: Andreas Färber @ 2015-02-12  0:55 UTC (permalink / raw)
      To: Michal Simek
      Cc: Olof Johansson, Sören Brinkmann, linux-arm-kernel,
    	Andreas Olofsson, Ola Jeppsson, Matteo Vit, Sean Rickerd,
    	Andreas Färber, Rob Herring, Pawel Moll, Mark Rutland,
    	Ian Campbell, Kumar Gala, Russell King,
    	open list:OPEN FIRMWARE AND..., open list
    
    This is the green LED CR10.
    
    Signed-off-by: Andreas Färber <afaerber@suse.de>
    ---
     arch/arm/boot/dts/zynq-parallella1.dtsi | 11 +++++++++++
     1 file changed, 11 insertions(+)
    
    diff --git a/arch/arm/boot/dts/zynq-parallella1.dtsi b/arch/arm/boot/dts/zynq-parallella1.dtsi
    index e77a4968fe17..8b2895c06c8e 100644
    --- a/arch/arm/boot/dts/zynq-parallella1.dtsi
    +++ b/arch/arm/boot/dts/zynq-parallella1.dtsi
    @@ -18,6 +18,7 @@
      * GNU General Public License for more details.
      */
     /include/ "zynq-7000.dtsi"
    +#include <dt-bindings/gpio/gpio.h>
     
     / {
     	compatible = "adapteva,parallella", "xlnx,zynq-7000";
    @@ -36,6 +37,16 @@
     		bootargs = "console=ttyPS0,115200 earlyprintk root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait";
     		linux,stdout-path = "/amba/serial@e0001000";
     	};
    +
    +	leds {
    +		compatible = "gpio-leds";
    +
    +		cr10 {
    +			label = "parallella:cr10:usr";
    +			gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
    +			default-state = "on";
    +		};
    +	};
     };
     
     &clkc {
    -- 
    2.2.2
    
    ^ permalink raw reply related	[flat|nested] 6+ messages in thread
  • * [PATCH 4/5] ARM: dts: zynq: Split off Parallella Microserver device tree
           [not found] <1423702513-4032-1-git-send-email-afaerber@suse.de>
                       ` (2 preceding siblings ...)
      2015-02-12  0:55 ` [PATCH 3/5] ARM: dts: zynq: Add LED for Parallella Andreas Färber
    @ 2015-02-12  0:55 ` Andreas Färber
      2015-02-12 13:12   ` Ola Jeppsson
      2015-02-12  0:55 ` [PATCH 5/5] ARM: dts: zynq: Add USB for Parallella Andreas Färber
      4 siblings, 1 reply; 6+ messages in thread
    From: Andreas Färber @ 2015-02-12  0:55 UTC (permalink / raw)
      To: Michal Simek
      Cc: Olof Johansson, Sören Brinkmann, linux-arm-kernel,
    	Andreas Olofsson, Ola Jeppsson, Matteo Vit, Sean Rickerd,
    	Andreas Färber, Rob Herring, Pawel Moll, Mark Rutland,
    	Ian Campbell, Kumar Gala, Russell King,
    	open list:OPEN FIRMWARE AND..., open list
    
    The Microserver edition has neither HDMI nor USB.
    
    Cc: Ola Jeppsson <ola@adapteva.com>
    Signed-off-by: Andreas Färber <afaerber@suse.de>
    ---
     arch/arm/boot/dts/Makefile                        |  1 +
     arch/arm/boot/dts/zynq-parallella-microserver.dts | 19 +++++++++++++++++++
     2 files changed, 20 insertions(+)
     create mode 100644 arch/arm/boot/dts/zynq-parallella-microserver.dts
    
    diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
    index a1c776b8dcec..42c75eeba584 100644
    --- a/arch/arm/boot/dts/Makefile
    +++ b/arch/arm/boot/dts/Makefile
    @@ -606,6 +606,7 @@ dtb-$(CONFIG_ARCH_VT8500) += \
     	wm8850-w70v2.dtb
     dtb-$(CONFIG_ARCH_ZYNQ) += \
     	zynq-parallella.dtb \
    +	zynq-parallella-microserver.dtb \
     	zynq-zc702.dtb \
     	zynq-zc706.dtb \
     	zynq-zed.dtb \
    diff --git a/arch/arm/boot/dts/zynq-parallella-microserver.dts b/arch/arm/boot/dts/zynq-parallella-microserver.dts
    new file mode 100644
    index 000000000000..1f3bd2d27a93
    --- /dev/null
    +++ b/arch/arm/boot/dts/zynq-parallella-microserver.dts
    @@ -0,0 +1,19 @@
    +/*
    + * Copyright (c) 2014 SUSE LINUX Products GmbH
    + * Copyright (c) 2015 SUSE Linux GmbH
    + *
    + * This software is licensed under the terms of the GNU General Public
    + * License version 2, as published by the Free Software Foundation, and
    + * may be copied, distributed, and modified under those terms.
    + *
    + * 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 "zynq-parallella1.dtsi"
    +
    +/ {
    +	model = "Adapteva Parallella Microserver Board";
    +};
    -- 
    2.2.2
    
    ^ permalink raw reply related	[flat|nested] 6+ messages in thread
  • * [PATCH 5/5] ARM: dts: zynq: Add USB for Parallella
           [not found] <1423702513-4032-1-git-send-email-afaerber@suse.de>
                       ` (3 preceding siblings ...)
      2015-02-12  0:55 ` [PATCH 4/5] ARM: dts: zynq: Split off Parallella Microserver device tree Andreas Färber
    @ 2015-02-12  0:55 ` Andreas Färber
      4 siblings, 0 replies; 6+ messages in thread
    From: Andreas Färber @ 2015-02-12  0:55 UTC (permalink / raw)
      To: Michal Simek
      Cc: Olof Johansson, Sören Brinkmann, linux-arm-kernel,
    	Andreas Olofsson, Ola Jeppsson, Matteo Vit, Sean Rickerd,
    	Andreas Färber, Rob Herring, Pawel Moll, Mark Rutland,
    	Ian Campbell, Kumar Gala, Russell King,
    	open list:OPEN FIRMWARE AND..., open list
    
    The Microserver edition does not feature USB - only the Kickstarter,
    pre-order, Desktop and Embedded editions.
    
    Signed-off-by: Andreas Färber <afaerber@suse.de>
    ---
     arch/arm/boot/dts/zynq-parallella.dts   | 16 +++++++
     arch/arm/boot/dts/zynq-parallella1.dtsi | 74 +++++++++++++++++++++++++++++++++
     2 files changed, 90 insertions(+)
    
    diff --git a/arch/arm/boot/dts/zynq-parallella.dts b/arch/arm/boot/dts/zynq-parallella.dts
    index 99ee6551ae8d..b2eede1c708f 100644
    --- a/arch/arm/boot/dts/zynq-parallella.dts
    +++ b/arch/arm/boot/dts/zynq-parallella.dts
    @@ -17,3 +17,19 @@
     / {
     	model = "Adapteva Parallella Board";
     };
    +
    +&usb_phy0 {
    +	status = "okay";
    +};
    +
    +&usb_phy1 {
    +	status = "okay";
    +};
    +
    +&usb0 {
    +	status = "okay";
    +};
    +
    +&usb1 {
    +	status = "okay";
    +};
    diff --git a/arch/arm/boot/dts/zynq-parallella1.dtsi b/arch/arm/boot/dts/zynq-parallella1.dtsi
    index 8b2895c06c8e..1395aaadf3be 100644
    --- a/arch/arm/boot/dts/zynq-parallella1.dtsi
    +++ b/arch/arm/boot/dts/zynq-parallella1.dtsi
    @@ -47,6 +47,18 @@
     			default-state = "on";
     		};
     	};
    +
    +	usb_phy0: phy0 {
    +		compatible = "usb-nop-xceiv";
    +		#phy-cells = <0>;
    +		status = "disabled";
    +	};
    +
    +	usb_phy1: phy1 {
    +		compatible = "usb-nop-xceiv";
    +		#phy-cells = <0>;
    +		status = "disabled";
    +	};
     };
     
     &clkc {
    @@ -208,6 +220,54 @@
     			bias-disable = <0>;
     		};
     	};
    +
    +	pinctrl_usb0_default: usb0-default {
    +		mux {
    +			function = "usb0";
    +			groups = "usb0_0_grp";
    +		};
    +
    +		conf {
    +			groups = "usb0_0_grp";
    +			slew-rate = <0>;
    +			io-standard = <1>;
    +		};
    +
    +		conf-rx {
    +			pins = "MIO29", "MIO31", "MIO36";
    +			bias-high-impedance;
    +		};
    +
    +		conf-tx {
    +			pins = "MIO28", "MIO30", "MIO32", "MIO33", "MIO34",
    +			       "MIO35", "MIO37", "MIO38", "MIO39";
    +			bias-disable;
    +		};
    +	};
    +
    +	pinctrl_usb1_default: usb1-default {
    +		mux {
    +			function = "usb1";
    +			groups = "usb1_0_grp";
    +		};
    +
    +		conf {
    +			groups = "usb1_0_grp";
    +			slew-rate = <0>;
    +			io-standard = <1>;
    +		};
    +
    +		conf-rx {
    +			pins = "MIO41", "MIO43", "MIO48";
    +			bias-high-impedance;
    +		};
    +
    +		conf-tx {
    +			pins = "MIO40", "MIO42", "MIO44", "MIO45", "MIO46",
    +			       "MIO47", "MIO49", "MIO50", "MIO51";
    +			bias-disable;
    +		};
    +	};
     };
     
     &sdhci1 {
    @@ -221,3 +281,17 @@
     	pinctrl-names = "default";
     	pinctrl-0 = <&pinctrl_uart1_default>;
     };
    +
    +&usb0 {
    +	dr_mode = "host";
    +	usb-phy = <&usb_phy0>;
    +	pinctrl-names = "default";
    +	pinctrl-0 = <&pinctrl_usb0_default>;
    +};
    +
    +&usb1 {
    +	dr_mode = "peripheral";
    +	usb-phy = <&usb_phy1>;
    +	pinctrl-names = "default";
    +	pinctrl-0 = <&pinctrl_usb1_default>;
    +};
    -- 
    2.2.2
    
    ^ permalink raw reply related	[flat|nested] 6+ messages in thread

  • end of thread, other threads:[~2015-02-12 13:12 UTC | newest]
    
    Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
    -- links below jump to the message on this page --
         [not found] <1423702513-4032-1-git-send-email-afaerber@suse.de>
         [not found] ` <1423702513-4032-1-git-send-email-afaerber-l3A5Bk7waGM@public.gmane.org>
    2015-02-12  0:55   ` [PATCH 1/5] ARM: dts: zynq: Split out common Parallella bits Andreas Färber
    2015-02-12  0:55 ` [PATCH 2/5] ARM: dts: zynq: Add pinctrl to Parallella Andreas Färber
    2015-02-12  0:55 ` [PATCH 3/5] ARM: dts: zynq: Add LED for Parallella Andreas Färber
    2015-02-12  0:55 ` [PATCH 4/5] ARM: dts: zynq: Split off Parallella Microserver device tree Andreas Färber
    2015-02-12 13:12   ` Ola Jeppsson
    2015-02-12  0:55 ` [PATCH 5/5] ARM: dts: zynq: Add USB for Parallella Andreas Färber
    

    This is a public inbox, see mirroring instructions
    for how to clone and mirror all data and code used for this inbox;
    as well as URLs for NNTP newsgroup(s).