* [PATCH RFC 0/4] SolidRun Hummingboard 2 support
@ 2017-01-08 15:02 Russell King - ARM Linux
2017-01-08 15:03 ` [PATCH 1/4] ARM: dts: imx6qdl: add HummingBoard2 boards Russell King
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Russell King - ARM Linux @ 2017-01-08 15:02 UTC (permalink / raw)
To: linux-arm-kernel
These patches add support for SolidRun's Hummingboard 2 to mainline.
The first is the official SolidRun DTS file supplied by Jon, the
remainder are cleanups to it for mainline.
These can be found in my HB2 branch.
arch/arm/boot/dts/Makefile | 2 +
arch/arm/boot/dts/imx6dl-hummingboard2.dts | 52 +++
arch/arm/boot/dts/imx6q-hummingboard2.dts | 60 +++
arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 562 +++++++++++++++++++++++++++
4 files changed, 676 insertions(+)
create mode 100644 arch/arm/boot/dts/imx6dl-hummingboard2.dts
create mode 100644 arch/arm/boot/dts/imx6q-hummingboard2.dts
create mode 100644 arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 1/4] ARM: dts: imx6qdl: add HummingBoard2 boards 2017-01-08 15:02 [PATCH RFC 0/4] SolidRun Hummingboard 2 support Russell King - ARM Linux @ 2017-01-08 15:03 ` Russell King 2017-01-08 15:07 ` Fabio Estevam 2017-01-10 7:31 ` Shawn Guo 2017-01-08 15:03 ` [PATCH 2/4] ARM: dts: imx6*-hummingboard2: fix SD card detect Russell King ` (2 subsequent siblings) 3 siblings, 2 replies; 9+ messages in thread From: Russell King @ 2017-01-08 15:03 UTC (permalink / raw) To: linux-arm-kernel From: Jon Nettleton <jon.nettleton@gmail.com> This adds support for the Hummingboard Gate and Edge devices from SolidRun. Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- arch/arm/boot/dts/Makefile | 2 + arch/arm/boot/dts/imx6dl-hummingboard2.dts | 52 +++ arch/arm/boot/dts/imx6q-hummingboard2.dts | 60 +++ arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 550 +++++++++++++++++++++++++++ 4 files changed, 664 insertions(+) create mode 100644 arch/arm/boot/dts/imx6dl-hummingboard2.dts create mode 100644 arch/arm/boot/dts/imx6q-hummingboard2.dts create mode 100644 arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index c558ba75cbcc..ea53640652f9 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -340,6 +340,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6dl-gw552x.dtb \ imx6dl-gw553x.dtb \ imx6dl-hummingboard.dtb \ + imx6dl-hummingboard2.dtb \ imx6dl-nit6xlite.dtb \ imx6dl-nitrogen6x.dtb \ imx6dl-phytec-pbab01.dtb \ @@ -381,6 +382,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6q-gw553x.dtb \ imx6q-h100.dtb \ imx6q-hummingboard.dtb \ + imx6q-hummingboard2.dtb \ imx6q-icore-rqs.dtb \ imx6q-marsboard.dtb \ imx6q-nitrogen6x.dtb \ diff --git a/arch/arm/boot/dts/imx6dl-hummingboard2.dts b/arch/arm/boot/dts/imx6dl-hummingboard2.dts new file mode 100644 index 000000000000..990b5050de5b --- /dev/null +++ b/arch/arm/boot/dts/imx6dl-hummingboard2.dts @@ -0,0 +1,52 @@ +/* + * Device Tree file for SolidRun HummingBoard2 + * Copyright (C) 2015 Rabeeh Khoury <rabeeh@solid-run.com> + * Based on work by Russell King + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License. + * + * This file 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. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ +/dts-v1/; + +#include "imx6dl.dtsi" +#include "imx6qdl-hummingboard2.dtsi" + +/ { + model = "SolidRun HummingBoard2 Solo/DualLite"; + compatible = "solidrun,hummingboard2/dl", "fsl,imx6dl"; +}; diff --git a/arch/arm/boot/dts/imx6q-hummingboard2.dts b/arch/arm/boot/dts/imx6q-hummingboard2.dts new file mode 100644 index 000000000000..f5eec9163bb8 --- /dev/null +++ b/arch/arm/boot/dts/imx6q-hummingboard2.dts @@ -0,0 +1,60 @@ +/* + * Device Tree file for SolidRun HummingBoard2 + * Copyright (C) 2015 Rabeeh Khoury <rabeeh@solid-run.com> + * Based on work by Russell King + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License. + * + * This file 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. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ +/dts-v1/; + +#include "imx6q.dtsi" +#include "imx6qdl-hummingboard2.dtsi" + +/ { + model = "SolidRun HummingBoard2 Dual/Quad"; + compatible = "solidrun,hummingboard2/q", "fsl,imx6q"; +}; + +&sata { + status = "okay"; + fsl,transmit-level-mV = <1104>; + fsl,transmit-boost-mdB = <0>; + fsl,transmit-atten-16ths = <9>; + fsl,no-spread-spectrum; +}; diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi new file mode 100644 index 000000000000..4512ed4fe011 --- /dev/null +++ b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi @@ -0,0 +1,550 @@ +/* + * Device Tree file for SolidRun HummingBoard2 + * Copyright (C) 2015 Rabeeh Khoury <rabeeh@solid-run.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License. + * + * This file 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. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ +#include "imx6qdl-microsom.dtsi" +#include "imx6qdl-microsom-ar8035.dtsi" + +/ { + chosen { + stdout-path = &uart1; + }; + + ir_recv: ir-receiver { + compatible = "gpio-ir-receiver"; + gpios = <&gpio7 9 1>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_gpio7_9>; + linux,rc-map-name = "rc-rc6-mce"; + }; + + regulators { + compatible = "simple-bus"; + + reg_3p3v: 3p3v { + compatible = "regulator-fixed"; + regulator-name = "3P3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + reg_1p8v: 1p8v { + compatible = "regulator-fixed"; + regulator-name = "1P8V"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + }; + + reg_usbh1_vbus: usb-h1-vbus { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio1 0 0>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_usbh1_vbus>; + regulator-name = "usb_h1_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + }; + + reg_usbotg_vbus: usb-otg-vbus { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio3 22 0>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_usbotg_vbus>; + regulator-name = "usb_otg_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + }; + + reg_usbh2_vbus: usb-h2-vbus { + compatible = "regulator-gpio"; + enable-active-high; + enable-gpio = <&gpio2 13 0>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_usbh2_vbus>; + regulator-name = "usb_h2_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-boot-on; + }; + + reg_usbh3_vbus: usb-h3-vbus { + compatible = "regulator-gpio"; + enable-active-high; + enable-gpio = <&gpio7 10 0>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_usbh3_vbus>; + regulator-name = "usb_h3_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-boot-on; + }; + }; + + usdhc2_pwrseq: usdhc2_pwrseq { + compatible = "mmc-pwrseq-simple"; + reset-gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>; + }; + + sound-sgtl5000 { + audio-codec = <&sgtl5000>; + audio-routing = + "MIC_IN", "Mic Jack", + "Mic Jack", "Mic Bias", + "Headphone Jack", "HP_OUT"; + compatible = "fsl,imx-audio-sgtl5000"; + model = "On-board Codec"; + mux-ext-port = <5>; + mux-int-port = <1>; + ssi-controller = <&ssi1>; + }; +}; + +&audmux { + status = "okay"; +}; + +&ecspi2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_ecspi2>; + fsl,spi-num-chipselects = <1>; + cs-gpios = <&gpio2 26 0>; + status = "okay"; +}; + +&hdmi { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_hdmi>; + ddc-i2c-bus = <&i2c2>; + status = "okay"; +}; + +&i2c1 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_i2c1>; + status = "okay"; + + rtc: pcf8523 at 68 { + compatible = "nxp,pcf8523"; + reg = <0x68>; + nxp,12p5_pf; + }; + + sgtl5000: sgtl5000 at 0a { + clocks = <&clks IMX6QDL_CLK_CKO>; + compatible = "fsl,sgtl5000"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_sgtl5000>; + reg = <0x0a>; + VDDA-supply = <®_3p3v>; + VDDIO-supply = <®_3p3v>; + }; +}; + +&i2c2 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_i2c2>; + status = "okay"; +}; + +&i2c3 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_i2c3>; + status = "okay"; +}; + +&iomuxc { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hog>; + hummingboard2 { + pinctrl_hog: hoggrp { + fsl,pins = < + /* + * 36 pin headers GPIO description. The pins + * numbering as following - + * + * 3.2v 5v 74 75 + * 73 72 71 70 + * 69 68 67 66 + * + * 77 78 79 76 + * 65 64 61 60 + * 53 52 51 50 + * 49 48 166 132 + * 95 94 90 91 + * GND 54 24 204 + * + * The GPIO numbers can be extracted using + * signal name from below. + * Example - + * MX6QDL_PAD_EIM_DA10__GPIO3_IO10 is + * GPIO(3,10) which is (3-1)*32+10 = gpio 74 + * + * i.e. The mapping of GPIO(X,Y) to Linux gpio + * number is : gpio number = (X-1) * 32 + Y + */ + /* DI1_PIN15 */ + MX6QDL_PAD_EIM_DA10__GPIO3_IO10 0x400130b1 + /* DI1_PIN02 */ + MX6QDL_PAD_EIM_DA11__GPIO3_IO11 0x400130b1 + /* DISP1_DATA00 */ + MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x400130b1 + /* DISP1_DATA01 */ + MX6QDL_PAD_EIM_DA8__GPIO3_IO08 0x400130b1 + /* DISP1_DATA02 */ + MX6QDL_PAD_EIM_DA7__GPIO3_IO07 0x400130b1 + /* DISP1_DATA03 */ + MX6QDL_PAD_EIM_DA6__GPIO3_IO06 0x400130b1 + /* DISP1_DATA04 */ + MX6QDL_PAD_EIM_DA5__GPIO3_IO05 0x400130b1 + /* DISP1_DATA05 */ + MX6QDL_PAD_EIM_DA4__GPIO3_IO04 0x400130b1 + /* DISP1_DATA06 */ + MX6QDL_PAD_EIM_DA3__GPIO3_IO03 0x400130b1 + /* DISP1_DATA07 */ + MX6QDL_PAD_EIM_DA2__GPIO3_IO02 0x400130b1 + /* DI1_D0_CS */ + MX6QDL_PAD_EIM_DA13__GPIO3_IO13 0x400130b1 + /* DI1_D1_CS */ + MX6QDL_PAD_EIM_DA14__GPIO3_IO14 0x400130b1 + /* DI1_PIN01 */ + MX6QDL_PAD_EIM_DA15__GPIO3_IO15 0x400130b1 + /* DI1_PIN03 */ + MX6QDL_PAD_EIM_DA12__GPIO3_IO12 0x400130b1 + /* DISP1_DATA08 */ + MX6QDL_PAD_EIM_DA1__GPIO3_IO01 0x400130b1 + /* DISP1_DATA09 */ + MX6QDL_PAD_EIM_DA0__GPIO3_IO00 0x400130b1 + /* DISP1_DATA10 */ + MX6QDL_PAD_EIM_EB1__GPIO2_IO29 0x400130b1 + /* DISP1_DATA11 */ + MX6QDL_PAD_EIM_EB0__GPIO2_IO28 0x400130b1 + /* DISP1_DATA12 */ + MX6QDL_PAD_EIM_A17__GPIO2_IO21 0x400130b1 + /* DISP1_DATA13 */ + MX6QDL_PAD_EIM_A18__GPIO2_IO20 0x400130b1 + /* DISP1_DATA14 */ + MX6QDL_PAD_EIM_A19__GPIO2_IO19 0x400130b1 + /* DISP1_DATA15 */ + MX6QDL_PAD_EIM_A20__GPIO2_IO18 0x400130b1 + /* DISP1_DATA16 */ + MX6QDL_PAD_EIM_A21__GPIO2_IO17 0x400130b1 + /* DISP1_DATA17 */ + MX6QDL_PAD_EIM_A22__GPIO2_IO16 0x400130b1 + /* DISP1_DATA18 */ + MX6QDL_PAD_EIM_A23__GPIO6_IO06 0x400130b1 + /* DISP1_DATA19 */ + MX6QDL_PAD_EIM_A24__GPIO5_IO04 0x400130b1 + /* DISP1_DATA20 */ + MX6QDL_PAD_EIM_D31__GPIO3_IO31 0x400130b1 + /* DISP1_DATA21 */ + MX6QDL_PAD_EIM_D30__GPIO3_IO30 0x400130b1 + /* DISP1_DATA22 */ + MX6QDL_PAD_EIM_D26__GPIO3_IO26 0x400130b1 + /* DISP1_DATA23 */ + MX6QDL_PAD_EIM_D27__GPIO3_IO27 0x400130b1 + /* DI1_DISP_CLK */ + MX6QDL_PAD_EIM_A16__GPIO2_IO22 0x400130b1 + /* SPDIF_IN */ + MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x400130b1 + /* SPDIF_OUT */ + MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x400130b1 + + /* MikroBUS GPIO pin number 10 */ + MX6QDL_PAD_EIM_LBA__GPIO2_IO27 0x400130b1 + >; + }; + + pinctrl_hummingboard2_gpio7_9: hummingboard2-gpio7_9 { + fsl,pins = < + MX6QDL_PAD_SD4_CMD__GPIO7_IO09 0x80000000 + >; + }; + + pinctrl_hummingboard2_hdmi: hummingboard2-hdmi { + fsl,pins = < + MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0 + >; + }; + + pinctrl_hummingboard2_i2c1: hummingboard2-i2c1 { + fsl,pins = < + MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1 + MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1 + >; + }; + + pinctrl_hummingboard2_i2c2: hummingboard2-i2c2 { + fsl,pins = < + MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1 + MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1 + >; + }; + + pinctrl_hummingboard2_i2c3: hummingboard2-i2c3 { + fsl,pins = < + MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1 + MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1 + >; + }; + + pinctrl_hummingboard2_mipi: hummingboard2_mipi { + fsl,pins = < + MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x4001b8b1 + MX6QDL_PAD_KEY_COL4__GPIO4_IO14 0x4001b8b1 + MX6QDL_PAD_NANDF_CS2__CCM_CLKO2 0x130b0 + >; + }; + + pinctrl_hummingboard2_pcie_reset: hummingboard2-pcie-reset { + fsl,pins = < + MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x1b0b1 + >; + }; + + pinctrl_hummingboard2_pwm1: pwm1grp { + fsl,pins = < + MX6QDL_PAD_DISP0_DAT8__PWM1_OUT 0x1b0b1 + >; + }; + + pinctrl_hummingboard2_sgtl5000: hummingboard2-sgtl5000 { + fsl,pins = < + MX6QDL_PAD_DISP0_DAT19__AUD5_RXD 0x130b0 + MX6QDL_PAD_KEY_COL0__AUD5_TXC 0x130b0 + MX6QDL_PAD_KEY_ROW0__AUD5_TXD 0x110b0 + MX6QDL_PAD_KEY_COL1__AUD5_TXFS 0x130b0 + MX6QDL_PAD_GPIO_5__CCM_CLKO1 0x130b0 + >; + }; + + pinctrl_hummingboard2_usbh1_vbus: hummingboard2-usbh1-vbus { + fsl,pins = <MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x1b0b0>; + }; + + pinctrl_hummingboard2_usbh2_vbus: hummingboard2-usbh2-vbus { + fsl,pins = <MX6QDL_PAD_SD4_DAT5__GPIO2_IO13 0x1b0b0>; + }; + + pinctrl_hummingboard2_usbh3_vbus: hummingboard2-usbh3-vbus { + fsl,pins = <MX6QDL_PAD_SD4_CLK__GPIO7_IO10 0x1b0b0>; + }; + + pinctrl_hummingboard2_usbotg_id: hummingboard2-usbotg-id { + /* + * Similar to pinctrl_usbotg_2, but we want it + * pulled down for a fixed host connection. + */ + fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>; + }; + + pinctrl_hummingboard2_usbotg_vbus: hummingboard2-usbotg-vbus { + fsl,pins = <MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b0>; + }; + + pinctrl_hummingboard2_usdhc2_aux: hummingboard2-usdhc2-aux { + fsl,pins = < + MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x13071 + MX6QDL_PAD_KEY_ROW1__SD2_VSELECT 0x1b071 + MX6QDL_PAD_DISP0_DAT9__GPIO4_IO30 0x1b0b0 + >; + }; + + pinctrl_hummingboard2_usdhc2: hummingboard2-usdhc2 { + fsl,pins = < + MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17059 + MX6QDL_PAD_SD2_CLK__SD2_CLK 0x10059 + MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059 + MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059 + MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059 + MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x13059 + >; + }; + + pinctrl_hummingboard2_usdhc2_100mhz: hummingboard2-usdhc2-100mhz { + fsl,pins = < + MX6QDL_PAD_SD2_CMD__SD2_CMD 0x170b9 + MX6QDL_PAD_SD2_CLK__SD2_CLK 0x100b9 + MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x170b9 + MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x170b9 + MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x170b9 + MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x130b9 + >; + }; + + pinctrl_hummingboard2_usdhc2_200mhz: hummingboard2-usdhc2-200mhz { + fsl,pins = < + MX6QDL_PAD_SD2_CMD__SD2_CMD 0x170f9 + MX6QDL_PAD_SD2_CLK__SD2_CLK 0x100f9 + MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x170f9 + MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x170f9 + MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x170f9 + MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x130f9 + >; + }; + + pinctrl_hummingboard2_usdhc3: hummingboard2-usdhc3 { + fsl,pins = < + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059 + MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059 + MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059 + MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059 + MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059 + MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059 + MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x17059 + MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x17059 + MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x17059 + MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059 + MX6QDL_PAD_SD3_RST__SD3_RESET 0x17059 + >; + }; + + pinctrl_hummingboard2_uart3: hummingboard2-uart3 { + fsl,pins = < + MX6QDL_PAD_EIM_D25__UART3_TX_DATA 0x1b0b1 + MX6QDL_PAD_EIM_D24__UART3_RX_DATA 0x40013000 + >; + }; + + pinctrl_hummingboard2_ecspi2: hummingboard2-ecspi2grp { + fsl,pins = < + MX6QDL_PAD_EIM_OE__ECSPI2_MISO 0x100b1 + MX6QDL_PAD_EIM_CS1__ECSPI2_MOSI 0x100b1 + MX6QDL_PAD_EIM_CS0__ECSPI2_SCLK 0x100b1 + MX6QDL_PAD_EIM_RW__GPIO2_IO26 0x000b1 /* CS */ + >; + }; + }; +}; + +&ldb { + status = "disabled"; + + lvds-channel at 0 { + fsl,data-mapping = "spwg"; + fsl,data-width = <18>; + }; +}; + +&pcie { + pinctrl-names = "default"; + pinctrl-0 = < + &pinctrl_hummingboard2_pcie_reset + >; + reset-gpio = <&gpio2 11 0>; + status = "okay"; +}; + +&pwm1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_pwm1>; + status = "okay"; +}; + +&pwm3 { + status = "disabled"; +}; + +&pwm4 { + status = "disabled"; +}; + +&ssi1 { + fsl,mode = "i2s-slave"; + status = "okay"; +}; + +&usbh1 { + disable-over-current; + vbus-supply = <®_usbh1_vbus>; + status = "okay"; +}; + +&usbotg { + disable-over-current; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_usbotg_id>; + vbus-supply = <®_usbotg_vbus>; + status = "okay"; +}; + +&usdhc2 { + pinctrl-names = "default", "state_100mhz", "state_200mhz"; + pinctrl-0 = < + &pinctrl_hummingboard2_usdhc2_aux + &pinctrl_hummingboard2_usdhc2 + >; + pinctrl-1 = < + &pinctrl_hummingboard2_usdhc2_aux + &pinctrl_hummingboard2_usdhc2_100mhz + >; + pinctrl-2 = < + &pinctrl_hummingboard2_usdhc2_aux + &pinctrl_hummingboard2_usdhc2_200mhz + >; + mmc-pwrseq = <&usdhc2_pwrseq>; + cd-gpios = <&gpio1 4 0>; + status = "okay"; +}; + +&usdhc3 { + pinctrl-names = "default"; + pinctrl-0 = < + &pinctrl_hummingboard2_usdhc3 + >; + vmmc-supply = <®_3p3v>; + vqmmc-supply = <®_3p3v>; + bus-width = <8>; + non-removable; + status = "okay"; +}; + +&uart3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_uart3>; + status = "okay"; +}; -- 2.7.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 1/4] ARM: dts: imx6qdl: add HummingBoard2 boards 2017-01-08 15:03 ` [PATCH 1/4] ARM: dts: imx6qdl: add HummingBoard2 boards Russell King @ 2017-01-08 15:07 ` Fabio Estevam 2017-01-08 15:20 ` Russell King - ARM Linux 2017-01-10 7:31 ` Shawn Guo 1 sibling, 1 reply; 9+ messages in thread From: Fabio Estevam @ 2017-01-08 15:07 UTC (permalink / raw) To: linux-arm-kernel On Sun, Jan 8, 2017 at 1:03 PM, Russell King <rmk+kernel@armlinux.org.uk> wrote: > From: Jon Nettleton <jon.nettleton@gmail.com> > > This adds support for the Hummingboard Gate and Edge devices from > SolidRun. > > Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com> > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> This one misses a Signed-off-by tag from Jon. ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/4] ARM: dts: imx6qdl: add HummingBoard2 boards 2017-01-08 15:07 ` Fabio Estevam @ 2017-01-08 15:20 ` Russell King - ARM Linux 0 siblings, 0 replies; 9+ messages in thread From: Russell King - ARM Linux @ 2017-01-08 15:20 UTC (permalink / raw) To: linux-arm-kernel On Sun, Jan 08, 2017 at 01:07:42PM -0200, Fabio Estevam wrote: > On Sun, Jan 8, 2017 at 1:03 PM, Russell King <rmk+kernel@armlinux.org.uk> wrote: > > From: Jon Nettleton <jon.nettleton@gmail.com> > > > > This adds support for the Hummingboard Gate and Edge devices from > > SolidRun. > > > > Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com> > > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> > > This one misses a Signed-off-by tag from Jon. That depends whether Jon is the author or not... Jon needs to comment on that. As I said in the cover, this is rather "not ready" but is being posted because Lucas is forcing our hands. -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/4] ARM: dts: imx6qdl: add HummingBoard2 boards 2017-01-08 15:03 ` [PATCH 1/4] ARM: dts: imx6qdl: add HummingBoard2 boards Russell King 2017-01-08 15:07 ` Fabio Estevam @ 2017-01-10 7:31 ` Shawn Guo 1 sibling, 0 replies; 9+ messages in thread From: Shawn Guo @ 2017-01-10 7:31 UTC (permalink / raw) To: linux-arm-kernel On Sun, Jan 08, 2017 at 03:03:11PM +0000, Russell King wrote: > From: Jon Nettleton <jon.nettleton@gmail.com> > > This adds support for the Hummingboard Gate and Edge devices from > SolidRun. > > Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com> > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> > --- > arch/arm/boot/dts/Makefile | 2 + > arch/arm/boot/dts/imx6dl-hummingboard2.dts | 52 +++ > arch/arm/boot/dts/imx6q-hummingboard2.dts | 60 +++ > arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 550 +++++++++++++++++++++++++++ > 4 files changed, 664 insertions(+) > create mode 100644 arch/arm/boot/dts/imx6dl-hummingboard2.dts > create mode 100644 arch/arm/boot/dts/imx6q-hummingboard2.dts > create mode 100644 arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index c558ba75cbcc..ea53640652f9 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -340,6 +340,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ > imx6dl-gw552x.dtb \ > imx6dl-gw553x.dtb \ > imx6dl-hummingboard.dtb \ > + imx6dl-hummingboard2.dtb \ > imx6dl-nit6xlite.dtb \ > imx6dl-nitrogen6x.dtb \ > imx6dl-phytec-pbab01.dtb \ > @@ -381,6 +382,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ > imx6q-gw553x.dtb \ > imx6q-h100.dtb \ > imx6q-hummingboard.dtb \ > + imx6q-hummingboard2.dtb \ > imx6q-icore-rqs.dtb \ > imx6q-marsboard.dtb \ > imx6q-nitrogen6x.dtb \ > diff --git a/arch/arm/boot/dts/imx6dl-hummingboard2.dts b/arch/arm/boot/dts/imx6dl-hummingboard2.dts > new file mode 100644 > index 000000000000..990b5050de5b > --- /dev/null > +++ b/arch/arm/boot/dts/imx6dl-hummingboard2.dts > @@ -0,0 +1,52 @@ > +/* > + * Device Tree file for SolidRun HummingBoard2 > + * Copyright (C) 2015 Rabeeh Khoury <rabeeh@solid-run.com> > + * Based on work by Russell King > + * > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This file is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of the > + * License. > + * > + * This file 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. > + * > + * Or, alternatively > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + */ The copyright text needs to be corrected as below. https://git.kernel.org/cgit/linux/kernel/git/shawnguo/linux.git/commit/?h=imx/dt&id=13283626c889fd5c03b485d54c924b795aca1c1e > +/dts-v1/; > + > +#include "imx6dl.dtsi" > +#include "imx6qdl-hummingboard2.dtsi" > + > +/ { > + model = "SolidRun HummingBoard2 Solo/DualLite"; > + compatible = "solidrun,hummingboard2/dl", "fsl,imx6dl"; > +}; > diff --git a/arch/arm/boot/dts/imx6q-hummingboard2.dts b/arch/arm/boot/dts/imx6q-hummingboard2.dts > new file mode 100644 > index 000000000000..f5eec9163bb8 > --- /dev/null > +++ b/arch/arm/boot/dts/imx6q-hummingboard2.dts > @@ -0,0 +1,60 @@ > +/* > + * Device Tree file for SolidRun HummingBoard2 > + * Copyright (C) 2015 Rabeeh Khoury <rabeeh@solid-run.com> > + * Based on work by Russell King > + * > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This file is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of the > + * License. > + * > + * This file 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. > + * > + * Or, alternatively > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + */ > +/dts-v1/; > + > +#include "imx6q.dtsi" > +#include "imx6qdl-hummingboard2.dtsi" > + > +/ { > + model = "SolidRun HummingBoard2 Dual/Quad"; > + compatible = "solidrun,hummingboard2/q", "fsl,imx6q"; > +}; > + > +&sata { > + status = "okay"; > + fsl,transmit-level-mV = <1104>; > + fsl,transmit-boost-mdB = <0>; > + fsl,transmit-atten-16ths = <9>; > + fsl,no-spread-spectrum; > +}; > diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi > new file mode 100644 > index 000000000000..4512ed4fe011 > --- /dev/null > +++ b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi > @@ -0,0 +1,550 @@ > +/* > + * Device Tree file for SolidRun HummingBoard2 > + * Copyright (C) 2015 Rabeeh Khoury <rabeeh@solid-run.com> > + * > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This file is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of the > + * License. > + * > + * This file 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. > + * > + * Or, alternatively > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + */ > +#include "imx6qdl-microsom.dtsi" > +#include "imx6qdl-microsom-ar8035.dtsi" > + > +/ { > + chosen { > + stdout-path = &uart1; > + }; > + > + ir_recv: ir-receiver { > + compatible = "gpio-ir-receiver"; > + gpios = <&gpio7 9 1>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_hummingboard2_gpio7_9>; > + linux,rc-map-name = "rc-rc6-mce"; > + }; > + > + regulators { > + compatible = "simple-bus"; DT folks do not like this fake bus container node, and we were asked to put fixed regulators directly under root for new board support. And we use the following naming scheme for them. reg_xxx: regulator-xxx { ... }; > + > + reg_3p3v: 3p3v { > + compatible = "regulator-fixed"; > + regulator-name = "3P3V"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + }; > + > + reg_1p8v: 1p8v { > + compatible = "regulator-fixed"; > + regulator-name = "1P8V"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + regulator-always-on; > + }; > + > + reg_usbh1_vbus: usb-h1-vbus { > + compatible = "regulator-fixed"; > + enable-active-high; > + gpio = <&gpio1 0 0>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_hummingboard2_usbh1_vbus>; > + regulator-name = "usb_h1_vbus"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + }; > + > + reg_usbotg_vbus: usb-otg-vbus { > + compatible = "regulator-fixed"; > + enable-active-high; > + gpio = <&gpio3 22 0>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_hummingboard2_usbotg_vbus>; > + regulator-name = "usb_otg_vbus"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + }; > + > + reg_usbh2_vbus: usb-h2-vbus { > + compatible = "regulator-gpio"; > + enable-active-high; > + enable-gpio = <&gpio2 13 0>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_hummingboard2_usbh2_vbus>; > + regulator-name = "usb_h2_vbus"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + regulator-boot-on; > + }; > + > + reg_usbh3_vbus: usb-h3-vbus { > + compatible = "regulator-gpio"; > + enable-active-high; > + enable-gpio = <&gpio7 10 0>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_hummingboard2_usbh3_vbus>; > + regulator-name = "usb_h3_vbus"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + regulator-boot-on; > + }; > + }; > + > + usdhc2_pwrseq: usdhc2_pwrseq { usdhc2_pwrseq: usdhc2-pwrseq Hyphen instead of underscore should generally used in node name. > + compatible = "mmc-pwrseq-simple"; > + reset-gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>; > + }; > + > + sound-sgtl5000 { > + audio-codec = <&sgtl5000>; > + audio-routing = > + "MIC_IN", "Mic Jack", > + "Mic Jack", "Mic Bias", > + "Headphone Jack", "HP_OUT"; > + compatible = "fsl,imx-audio-sgtl5000"; > + model = "On-board Codec"; > + mux-ext-port = <5>; > + mux-int-port = <1>; > + ssi-controller = <&ssi1>; > + }; > +}; > + > +&audmux { > + status = "okay"; > +}; > + > +&ecspi2 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_hummingboard2_ecspi2>; > + fsl,spi-num-chipselects = <1>; This property is obsolete, and can be dropped. > + cs-gpios = <&gpio2 26 0>; > + status = "okay"; > +}; > + > +&hdmi { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_hummingboard2_hdmi>; > + ddc-i2c-bus = <&i2c2>; > + status = "okay"; > +}; > + > +&i2c1 { > + clock-frequency = <100000>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_hummingboard2_i2c1>; > + status = "okay"; > + > + rtc: pcf8523 at 68 { Node name should be generic, while label can be specific. That said, pcf8523: rtc at 68 would be more appropriate. > + compatible = "nxp,pcf8523"; Undocumented bindings. > + reg = <0x68>; > + nxp,12p5_pf; > + }; > + > + sgtl5000: sgtl5000 at 0a { sgtl5000: codec at a { > + clocks = <&clks IMX6QDL_CLK_CKO>; > + compatible = "fsl,sgtl5000"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_hummingboard2_sgtl5000>; > + reg = <0x0a>; > + VDDA-supply = <®_3p3v>; > + VDDIO-supply = <®_3p3v>; > + }; > +}; > + > +&i2c2 { > + clock-frequency = <100000>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_hummingboard2_i2c2>; > + status = "okay"; > +}; > + > +&i2c3 { > + clock-frequency = <100000>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_hummingboard2_i2c3>; > + status = "okay"; > +}; > + > +&iomuxc { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_hog>; Have a newline between properties and child node. > + hummingboard2 { > + pinctrl_hog: hoggrp { > + fsl,pins = < > + /* > + * 36 pin headers GPIO description. The pins > + * numbering as following - > + * > + * 3.2v 5v 74 75 > + * 73 72 71 70 > + * 69 68 67 66 > + * > + * 77 78 79 76 > + * 65 64 61 60 > + * 53 52 51 50 > + * 49 48 166 132 > + * 95 94 90 91 > + * GND 54 24 204 > + * > + * The GPIO numbers can be extracted using > + * signal name from below. > + * Example - > + * MX6QDL_PAD_EIM_DA10__GPIO3_IO10 is > + * GPIO(3,10) which is (3-1)*32+10 = gpio 74 > + * > + * i.e. The mapping of GPIO(X,Y) to Linux gpio > + * number is : gpio number = (X-1) * 32 + Y > + */ > + /* DI1_PIN15 */ > + MX6QDL_PAD_EIM_DA10__GPIO3_IO10 0x400130b1 > + /* DI1_PIN02 */ > + MX6QDL_PAD_EIM_DA11__GPIO3_IO11 0x400130b1 > + /* DISP1_DATA00 */ > + MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x400130b1 > + /* DISP1_DATA01 */ > + MX6QDL_PAD_EIM_DA8__GPIO3_IO08 0x400130b1 > + /* DISP1_DATA02 */ > + MX6QDL_PAD_EIM_DA7__GPIO3_IO07 0x400130b1 > + /* DISP1_DATA03 */ > + MX6QDL_PAD_EIM_DA6__GPIO3_IO06 0x400130b1 > + /* DISP1_DATA04 */ > + MX6QDL_PAD_EIM_DA5__GPIO3_IO05 0x400130b1 > + /* DISP1_DATA05 */ > + MX6QDL_PAD_EIM_DA4__GPIO3_IO04 0x400130b1 > + /* DISP1_DATA06 */ > + MX6QDL_PAD_EIM_DA3__GPIO3_IO03 0x400130b1 > + /* DISP1_DATA07 */ > + MX6QDL_PAD_EIM_DA2__GPIO3_IO02 0x400130b1 > + /* DI1_D0_CS */ > + MX6QDL_PAD_EIM_DA13__GPIO3_IO13 0x400130b1 > + /* DI1_D1_CS */ > + MX6QDL_PAD_EIM_DA14__GPIO3_IO14 0x400130b1 > + /* DI1_PIN01 */ > + MX6QDL_PAD_EIM_DA15__GPIO3_IO15 0x400130b1 > + /* DI1_PIN03 */ > + MX6QDL_PAD_EIM_DA12__GPIO3_IO12 0x400130b1 > + /* DISP1_DATA08 */ > + MX6QDL_PAD_EIM_DA1__GPIO3_IO01 0x400130b1 > + /* DISP1_DATA09 */ > + MX6QDL_PAD_EIM_DA0__GPIO3_IO00 0x400130b1 > + /* DISP1_DATA10 */ > + MX6QDL_PAD_EIM_EB1__GPIO2_IO29 0x400130b1 > + /* DISP1_DATA11 */ > + MX6QDL_PAD_EIM_EB0__GPIO2_IO28 0x400130b1 > + /* DISP1_DATA12 */ > + MX6QDL_PAD_EIM_A17__GPIO2_IO21 0x400130b1 > + /* DISP1_DATA13 */ > + MX6QDL_PAD_EIM_A18__GPIO2_IO20 0x400130b1 > + /* DISP1_DATA14 */ > + MX6QDL_PAD_EIM_A19__GPIO2_IO19 0x400130b1 > + /* DISP1_DATA15 */ > + MX6QDL_PAD_EIM_A20__GPIO2_IO18 0x400130b1 > + /* DISP1_DATA16 */ > + MX6QDL_PAD_EIM_A21__GPIO2_IO17 0x400130b1 > + /* DISP1_DATA17 */ > + MX6QDL_PAD_EIM_A22__GPIO2_IO16 0x400130b1 > + /* DISP1_DATA18 */ > + MX6QDL_PAD_EIM_A23__GPIO6_IO06 0x400130b1 > + /* DISP1_DATA19 */ > + MX6QDL_PAD_EIM_A24__GPIO5_IO04 0x400130b1 > + /* DISP1_DATA20 */ > + MX6QDL_PAD_EIM_D31__GPIO3_IO31 0x400130b1 > + /* DISP1_DATA21 */ > + MX6QDL_PAD_EIM_D30__GPIO3_IO30 0x400130b1 > + /* DISP1_DATA22 */ > + MX6QDL_PAD_EIM_D26__GPIO3_IO26 0x400130b1 > + /* DISP1_DATA23 */ > + MX6QDL_PAD_EIM_D27__GPIO3_IO27 0x400130b1 > + /* DI1_DISP_CLK */ > + MX6QDL_PAD_EIM_A16__GPIO2_IO22 0x400130b1 > + /* SPDIF_IN */ > + MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x400130b1 > + /* SPDIF_OUT */ > + MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x400130b1 > + > + /* MikroBUS GPIO pin number 10 */ > + MX6QDL_PAD_EIM_LBA__GPIO2_IO27 0x400130b1 > + >; > + }; > + > + pinctrl_hummingboard2_gpio7_9: hummingboard2-gpio7_9 { > + fsl,pins = < > + MX6QDL_PAD_SD4_CMD__GPIO7_IO09 0x80000000 > + >; > + }; > + > + pinctrl_hummingboard2_hdmi: hummingboard2-hdmi { > + fsl,pins = < > + MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0 > + >; > + }; > + > + pinctrl_hummingboard2_i2c1: hummingboard2-i2c1 { > + fsl,pins = < > + MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1 > + MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1 > + >; > + }; > + > + pinctrl_hummingboard2_i2c2: hummingboard2-i2c2 { > + fsl,pins = < > + MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1 > + MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1 > + >; > + }; > + > + pinctrl_hummingboard2_i2c3: hummingboard2-i2c3 { > + fsl,pins = < > + MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1 > + MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1 > + >; > + }; > + > + pinctrl_hummingboard2_mipi: hummingboard2_mipi { > + fsl,pins = < > + MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x4001b8b1 > + MX6QDL_PAD_KEY_COL4__GPIO4_IO14 0x4001b8b1 > + MX6QDL_PAD_NANDF_CS2__CCM_CLKO2 0x130b0 > + >; > + }; Use tabs instead of spaces for indentation. > + > + pinctrl_hummingboard2_pcie_reset: hummingboard2-pcie-reset { > + fsl,pins = < > + MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x1b0b1 > + >; > + }; > + > + pinctrl_hummingboard2_pwm1: pwm1grp { > + fsl,pins = < > + MX6QDL_PAD_DISP0_DAT8__PWM1_OUT 0x1b0b1 > + >; > + }; > + > + pinctrl_hummingboard2_sgtl5000: hummingboard2-sgtl5000 { > + fsl,pins = < > + MX6QDL_PAD_DISP0_DAT19__AUD5_RXD 0x130b0 > + MX6QDL_PAD_KEY_COL0__AUD5_TXC 0x130b0 > + MX6QDL_PAD_KEY_ROW0__AUD5_TXD 0x110b0 > + MX6QDL_PAD_KEY_COL1__AUD5_TXFS 0x130b0 > + MX6QDL_PAD_GPIO_5__CCM_CLKO1 0x130b0 > + >; > + }; > + > + pinctrl_hummingboard2_usbh1_vbus: hummingboard2-usbh1-vbus { > + fsl,pins = <MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x1b0b0>; > + }; > + > + pinctrl_hummingboard2_usbh2_vbus: hummingboard2-usbh2-vbus { > + fsl,pins = <MX6QDL_PAD_SD4_DAT5__GPIO2_IO13 0x1b0b0>; > + }; > + > + pinctrl_hummingboard2_usbh3_vbus: hummingboard2-usbh3-vbus { > + fsl,pins = <MX6QDL_PAD_SD4_CLK__GPIO7_IO10 0x1b0b0>; > + }; > + > + pinctrl_hummingboard2_usbotg_id: hummingboard2-usbotg-id { > + /* > + * Similar to pinctrl_usbotg_2, but we want it > + * pulled down for a fixed host connection. > + */ > + fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>; > + }; > + > + pinctrl_hummingboard2_usbotg_vbus: hummingboard2-usbotg-vbus { > + fsl,pins = <MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b0>; > + }; > + > + pinctrl_hummingboard2_usdhc2_aux: hummingboard2-usdhc2-aux { > + fsl,pins = < > + MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x13071 > + MX6QDL_PAD_KEY_ROW1__SD2_VSELECT 0x1b071 > + MX6QDL_PAD_DISP0_DAT9__GPIO4_IO30 0x1b0b0 > + >; > + }; > + > + pinctrl_hummingboard2_usdhc2: hummingboard2-usdhc2 { > + fsl,pins = < > + MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17059 > + MX6QDL_PAD_SD2_CLK__SD2_CLK 0x10059 > + MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059 > + MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059 > + MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059 > + MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x13059 > + >; > + }; > + > + pinctrl_hummingboard2_usdhc2_100mhz: hummingboard2-usdhc2-100mhz { > + fsl,pins = < > + MX6QDL_PAD_SD2_CMD__SD2_CMD 0x170b9 > + MX6QDL_PAD_SD2_CLK__SD2_CLK 0x100b9 > + MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x170b9 > + MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x170b9 > + MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x170b9 > + MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x130b9 > + >; > + }; > + > + pinctrl_hummingboard2_usdhc2_200mhz: hummingboard2-usdhc2-200mhz { > + fsl,pins = < > + MX6QDL_PAD_SD2_CMD__SD2_CMD 0x170f9 > + MX6QDL_PAD_SD2_CLK__SD2_CLK 0x100f9 > + MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x170f9 > + MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x170f9 > + MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x170f9 > + MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x130f9 > + >; > + }; > + > + pinctrl_hummingboard2_usdhc3: hummingboard2-usdhc3 { > + fsl,pins = < > + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059 > + MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059 > + MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059 > + MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059 > + MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059 > + MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059 > + MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x17059 > + MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x17059 > + MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x17059 > + MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059 > + MX6QDL_PAD_SD3_RST__SD3_RESET 0x17059 > + >; > + }; > + > + pinctrl_hummingboard2_uart3: hummingboard2-uart3 { > + fsl,pins = < > + MX6QDL_PAD_EIM_D25__UART3_TX_DATA 0x1b0b1 > + MX6QDL_PAD_EIM_D24__UART3_RX_DATA 0x40013000 > + >; > + }; > + > + pinctrl_hummingboard2_ecspi2: hummingboard2-ecspi2grp { This one is not sorted. > + fsl,pins = < > + MX6QDL_PAD_EIM_OE__ECSPI2_MISO 0x100b1 > + MX6QDL_PAD_EIM_CS1__ECSPI2_MOSI 0x100b1 > + MX6QDL_PAD_EIM_CS0__ECSPI2_SCLK 0x100b1 > + MX6QDL_PAD_EIM_RW__GPIO2_IO26 0x000b1 /* CS */ > + >; > + }; > + }; > +}; > + > +&ldb { > + status = "disabled"; > + > + lvds-channel at 0 { > + fsl,data-mapping = "spwg"; > + fsl,data-width = <18>; > + }; > +}; > + > +&pcie { > + pinctrl-names = "default"; > + pinctrl-0 = < > + &pinctrl_hummingboard2_pcie_reset > + >; pinctrl-0 = <&pinctrl_hummingboard2_pcie_reset>; > + reset-gpio = <&gpio2 11 0>; > + status = "okay"; > +}; > + > +&pwm1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_hummingboard2_pwm1>; > + status = "okay"; > +}; > + > +&pwm3 { > + status = "disabled"; > +}; > + > +&pwm4 { > + status = "disabled"; > +}; > + > +&ssi1 { > + fsl,mode = "i2s-slave"; Please check commit b93427b1c057 ("ASoC: fsl ssi doc: Remove unused properties"). Shawn > + status = "okay"; > +}; > + > +&usbh1 { > + disable-over-current; > + vbus-supply = <®_usbh1_vbus>; > + status = "okay"; > +}; > + > +&usbotg { > + disable-over-current; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_hummingboard2_usbotg_id>; > + vbus-supply = <®_usbotg_vbus>; > + status = "okay"; > +}; > + > +&usdhc2 { > + pinctrl-names = "default", "state_100mhz", "state_200mhz"; > + pinctrl-0 = < > + &pinctrl_hummingboard2_usdhc2_aux > + &pinctrl_hummingboard2_usdhc2 > + >; > + pinctrl-1 = < > + &pinctrl_hummingboard2_usdhc2_aux > + &pinctrl_hummingboard2_usdhc2_100mhz > + >; > + pinctrl-2 = < > + &pinctrl_hummingboard2_usdhc2_aux > + &pinctrl_hummingboard2_usdhc2_200mhz > + >; > + mmc-pwrseq = <&usdhc2_pwrseq>; > + cd-gpios = <&gpio1 4 0>; > + status = "okay"; > +}; > + > +&usdhc3 { > + pinctrl-names = "default"; > + pinctrl-0 = < > + &pinctrl_hummingboard2_usdhc3 > + >; > + vmmc-supply = <®_3p3v>; > + vqmmc-supply = <®_3p3v>; > + bus-width = <8>; > + non-removable; > + status = "okay"; > +}; > + > +&uart3 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_hummingboard2_uart3>; > + status = "okay"; > +}; > -- > 2.7.4 > ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/4] ARM: dts: imx6*-hummingboard2: fix SD card detect 2017-01-08 15:02 [PATCH RFC 0/4] SolidRun Hummingboard 2 support Russell King - ARM Linux 2017-01-08 15:03 ` [PATCH 1/4] ARM: dts: imx6qdl: add HummingBoard2 boards Russell King @ 2017-01-08 15:03 ` Russell King 2017-01-08 15:03 ` [PATCH 3/4] ARM: dts: imx6*-hummingboard2: use proper gpio flags definitions Russell King 2017-01-08 15:03 ` [PATCH 4/4] ARM: dts: imx6*-hummingboard2: convert to more conventional vmmc-supply Russell King 3 siblings, 0 replies; 9+ messages in thread From: Russell King @ 2017-01-08 15:03 UTC (permalink / raw) To: linux-arm-kernel Fix the SD card detect signal, which was missing the polarity specification, and the pull-up necessary for proper signalling. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi index 4512ed4fe011..a98ddcad175f 100644 --- a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi +++ b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi @@ -388,7 +388,7 @@ pinctrl_hummingboard2_usdhc2_aux: hummingboard2-usdhc2-aux { fsl,pins = < - MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x13071 + MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x1f071 MX6QDL_PAD_KEY_ROW1__SD2_VSELECT 0x1b071 MX6QDL_PAD_DISP0_DAT9__GPIO4_IO30 0x1b0b0 >; @@ -527,7 +527,7 @@ &pinctrl_hummingboard2_usdhc2_200mhz >; mmc-pwrseq = <&usdhc2_pwrseq>; - cd-gpios = <&gpio1 4 0>; + cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; status = "okay"; }; -- 2.7.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/4] ARM: dts: imx6*-hummingboard2: use proper gpio flags definitions 2017-01-08 15:02 [PATCH RFC 0/4] SolidRun Hummingboard 2 support Russell King - ARM Linux 2017-01-08 15:03 ` [PATCH 1/4] ARM: dts: imx6qdl: add HummingBoard2 boards Russell King 2017-01-08 15:03 ` [PATCH 2/4] ARM: dts: imx6*-hummingboard2: fix SD card detect Russell King @ 2017-01-08 15:03 ` Russell King 2017-01-08 15:03 ` [PATCH 4/4] ARM: dts: imx6*-hummingboard2: convert to more conventional vmmc-supply Russell King 3 siblings, 0 replies; 9+ messages in thread From: Russell King @ 2017-01-08 15:03 UTC (permalink / raw) To: linux-arm-kernel Use proper gpio flag definitions for GPIOs rather than using opaque uninformative numbers. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi index a98ddcad175f..88833d757f7b 100644 --- a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi +++ b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi @@ -50,7 +50,7 @@ ir_recv: ir-receiver { compatible = "gpio-ir-receiver"; - gpios = <&gpio7 9 1>; + gpios = <&gpio7 9 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hummingboard2_gpio7_9>; linux,rc-map-name = "rc-rc6-mce"; @@ -78,7 +78,7 @@ reg_usbh1_vbus: usb-h1-vbus { compatible = "regulator-fixed"; enable-active-high; - gpio = <&gpio1 0 0>; + gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hummingboard2_usbh1_vbus>; regulator-name = "usb_h1_vbus"; @@ -89,7 +89,7 @@ reg_usbotg_vbus: usb-otg-vbus { compatible = "regulator-fixed"; enable-active-high; - gpio = <&gpio3 22 0>; + gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hummingboard2_usbotg_vbus>; regulator-name = "usb_otg_vbus"; @@ -100,7 +100,7 @@ reg_usbh2_vbus: usb-h2-vbus { compatible = "regulator-gpio"; enable-active-high; - enable-gpio = <&gpio2 13 0>; + enable-gpio = <&gpio2 13 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hummingboard2_usbh2_vbus>; regulator-name = "usb_h2_vbus"; @@ -112,7 +112,7 @@ reg_usbh3_vbus: usb-h3-vbus { compatible = "regulator-gpio"; enable-active-high; - enable-gpio = <&gpio7 10 0>; + enable-gpio = <&gpio7 10 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hummingboard2_usbh3_vbus>; regulator-name = "usb_h3_vbus"; -- 2.7.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/4] ARM: dts: imx6*-hummingboard2: convert to more conventional vmmc-supply 2017-01-08 15:02 [PATCH RFC 0/4] SolidRun Hummingboard 2 support Russell King - ARM Linux ` (2 preceding siblings ...) 2017-01-08 15:03 ` [PATCH 3/4] ARM: dts: imx6*-hummingboard2: use proper gpio flags definitions Russell King @ 2017-01-08 15:03 ` Russell King 2017-01-08 15:06 ` Russell King - ARM Linux 3 siblings, 1 reply; 9+ messages in thread From: Russell King @ 2017-01-08 15:03 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi index 88833d757f7b..66098a5fdd8d 100644 --- a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi +++ b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi @@ -75,6 +75,18 @@ regulator-always-on; }; + reg_usdhc2_vmmc: reg-usdhc2-vmmc { + compatible = "regulator-fixed"; + gpio = <&gpio4 30 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_vmmc>; + regulator-boot-on; + regulator-max-microvolt = <3300000>; + regulator-min-microvolt = <3300000>; + regulator-name = "usdhc2_vmmc"; + startup-delay-us = <1000>; + }; + reg_usbh1_vbus: usb-h1-vbus { compatible = "regulator-fixed"; enable-active-high; @@ -122,11 +134,6 @@ }; }; - usdhc2_pwrseq: usdhc2_pwrseq { - compatible = "mmc-pwrseq-simple"; - reset-gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>; - }; - sound-sgtl5000 { audio-codec = <&sgtl5000>; audio-routing = @@ -388,7 +395,6 @@ pinctrl_hummingboard2_usdhc2_aux: hummingboard2-usdhc2-aux { fsl,pins = < - MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x1f071 MX6QDL_PAD_KEY_ROW1__SD2_VSELECT 0x1b071 MX6QDL_PAD_DISP0_DAT9__GPIO4_IO30 0x1b0b0 >; @@ -427,6 +433,12 @@ >; }; + pinctrl_hummingboard2_vmmc: hummingboard2-vmmc { + fsl,pins = < + MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x1f071 + >; + }; + pinctrl_hummingboard2_usdhc3: hummingboard2-usdhc3 { fsl,pins = < MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059 @@ -526,7 +538,7 @@ &pinctrl_hummingboard2_usdhc2_aux &pinctrl_hummingboard2_usdhc2_200mhz >; - mmc-pwrseq = <&usdhc2_pwrseq>; + vmmc-supply = <®_usdhc2_vmmc>; cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; status = "okay"; }; -- 2.7.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/4] ARM: dts: imx6*-hummingboard2: convert to more conventional vmmc-supply 2017-01-08 15:03 ` [PATCH 4/4] ARM: dts: imx6*-hummingboard2: convert to more conventional vmmc-supply Russell King @ 2017-01-08 15:06 ` Russell King - ARM Linux 0 siblings, 0 replies; 9+ messages in thread From: Russell King - ARM Linux @ 2017-01-08 15:06 UTC (permalink / raw) To: linux-arm-kernel Damn it, missed the RFC annotation on these patches (very easy to do) and this one doesn't have a description yet because it needs discussion with Jon and testing. On Sun, Jan 08, 2017 at 03:03:26PM +0000, Russell King wrote: > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> > --- > arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 26 +++++++++++++++++++------- > 1 file changed, 19 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi > index 88833d757f7b..66098a5fdd8d 100644 > --- a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi > +++ b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi > @@ -75,6 +75,18 @@ > regulator-always-on; > }; > > + reg_usdhc2_vmmc: reg-usdhc2-vmmc { > + compatible = "regulator-fixed"; > + gpio = <&gpio4 30 GPIO_ACTIVE_HIGH>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_hummingboard2_vmmc>; > + regulator-boot-on; > + regulator-max-microvolt = <3300000>; > + regulator-min-microvolt = <3300000>; > + regulator-name = "usdhc2_vmmc"; > + startup-delay-us = <1000>; > + }; > + > reg_usbh1_vbus: usb-h1-vbus { > compatible = "regulator-fixed"; > enable-active-high; > @@ -122,11 +134,6 @@ > }; > }; > > - usdhc2_pwrseq: usdhc2_pwrseq { > - compatible = "mmc-pwrseq-simple"; > - reset-gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>; > - }; > - > sound-sgtl5000 { > audio-codec = <&sgtl5000>; > audio-routing = > @@ -388,7 +395,6 @@ > > pinctrl_hummingboard2_usdhc2_aux: hummingboard2-usdhc2-aux { > fsl,pins = < > - MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x1f071 > MX6QDL_PAD_KEY_ROW1__SD2_VSELECT 0x1b071 > MX6QDL_PAD_DISP0_DAT9__GPIO4_IO30 0x1b0b0 > >; > @@ -427,6 +433,12 @@ > >; > }; > > + pinctrl_hummingboard2_vmmc: hummingboard2-vmmc { > + fsl,pins = < > + MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x1f071 > + >; > + }; > + > pinctrl_hummingboard2_usdhc3: hummingboard2-usdhc3 { > fsl,pins = < > MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059 > @@ -526,7 +538,7 @@ > &pinctrl_hummingboard2_usdhc2_aux > &pinctrl_hummingboard2_usdhc2_200mhz > >; > - mmc-pwrseq = <&usdhc2_pwrseq>; > + vmmc-supply = <®_usdhc2_vmmc>; > cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; > status = "okay"; > }; > -- > 2.7.4 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-01-10 7:31 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-01-08 15:02 [PATCH RFC 0/4] SolidRun Hummingboard 2 support Russell King - ARM Linux 2017-01-08 15:03 ` [PATCH 1/4] ARM: dts: imx6qdl: add HummingBoard2 boards Russell King 2017-01-08 15:07 ` Fabio Estevam 2017-01-08 15:20 ` Russell King - ARM Linux 2017-01-10 7:31 ` Shawn Guo 2017-01-08 15:03 ` [PATCH 2/4] ARM: dts: imx6*-hummingboard2: fix SD card detect Russell King 2017-01-08 15:03 ` [PATCH 3/4] ARM: dts: imx6*-hummingboard2: use proper gpio flags definitions Russell King 2017-01-08 15:03 ` [PATCH 4/4] ARM: dts: imx6*-hummingboard2: convert to more conventional vmmc-supply Russell King 2017-01-08 15:06 ` Russell King - ARM Linux
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).