* [PATCH v2 0/4] Add support for kosagi novena
@ 2014-12-22 8:32 Sean Cross
2014-12-22 8:32 ` [PATCH v2 1/4] drm/panel: simple: Add Innolux N133HSE panel support Sean Cross
` (3 more replies)
0 siblings, 4 replies; 13+ messages in thread
From: Sean Cross @ 2014-12-22 8:32 UTC (permalink / raw)
To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Lucas Stach, Shawn Guo, Bjorn Helgaas, devicetree, Richard Zhu,
Grant Likely, linux-pci
Cc: bunnie, Sean Cross
The Kosagi Novena mainboard contains an i.MX6, along with a PCI Express slot.
This patchset adds regulator support to the PCI Express slot, and adds
device tree support for the Novena mainboard.
Changes since v1:
- Add 'kosagi' to vendor prefixes
- Add LCD panel to simple-panel
- Renamed power-supply to bus-supply
- Replaced devm_regulator_get() with devm_regulator_get_optional()
- Moved regulator_enable to imx6_add_pcie_port()
- Removed fpga@1 from spi definition in dts -- will use overlays instead
Sean Cross (4):
drm/panel: simple: Add Innolux N133HSE panel support
devicetree: bindings: Add vendor prefix for Kosagi
PCI: imx6: Add power-supply support
ARM: dts: imx6q: add Novena board
.../devicetree/bindings/pci/fsl,imx6q-pcie.txt | 3 +
.../devicetree/bindings/vendor-prefixes.txt | 1 +
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/imx6q-novena.dts | 856 +++++++++++++++++++++
drivers/gpu/drm/panel/panel-simple.c | 26 +
drivers/pci/host/pci-imx6.c | 27 +
6 files changed, 914 insertions(+)
create mode 100644 arch/arm/boot/dts/imx6q-novena.dts
--
2.1.3
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH v2 1/4] drm/panel: simple: Add Innolux N133HSE panel support 2014-12-22 8:32 [PATCH v2 0/4] Add support for kosagi novena Sean Cross @ 2014-12-22 8:32 ` Sean Cross 2014-12-22 8:32 ` [PATCH v2 2/4] devicetree: bindings: Add vendor prefix for Kosagi Sean Cross ` (2 subsequent siblings) 3 siblings, 0 replies; 13+ messages in thread From: Sean Cross @ 2014-12-22 8:32 UTC (permalink / raw) To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Lucas Stach, Shawn Guo, Bjorn Helgaas, devicetree, Richard Zhu, Grant Likely, linux-pci Cc: bunnie, Sean Cross The Innolux N133HSE panel is a 13.3" 1920x1080 panel that contains an integrated backlight, and connects via eDP. It is used in the Kosagi Novena. Signed-off-by: Sean Cross <xobs@kosagi.com> --- drivers/gpu/drm/panel/panel-simple.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c index 23de22f..1e16568 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -566,6 +566,29 @@ static const struct panel_desc innolux_n116bge = { }, }; +static const struct drm_display_mode innolux_n133hse_ea1_mode = { + .clock = 138500, + .hdisplay = 1920, + .hsync_start = 1920 + 46, + .hsync_end = 1920 + 46 + 30, + .htotal = 1920 + 160, + .vdisplay = 1080, + .vsync_start = 1080 + 2, + .vsync_end = 1080 + 2 + 4, + .vtotal = 1080 + 32, + .vrefresh = 60, +}; + +static const struct panel_desc innolux_n133hse_ea1 = { + .modes = &innolux_n133hse_ea1_mode, + .num_modes = 1, + .bpc = 8, + .size = { + .width = 293, + .height = 165, + }, +}; + static const struct drm_display_mode innolux_n156bge_l21_mode = { .clock = 69300, .hdisplay = 1366, @@ -670,6 +693,9 @@ static const struct of_device_id platform_of_match[] = { .compatible = "innolux,n116bge", .data = &innolux_n116bge, }, { + .compatible = "innolux,n133hse-ea1", + .data = &innolux_n133hse_ea1, + }, { .compatible = "innolux,n156bge-l21", .data = &innolux_n156bge_l21, }, { -- 2.1.3 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v2 2/4] devicetree: bindings: Add vendor prefix for Kosagi 2014-12-22 8:32 [PATCH v2 0/4] Add support for kosagi novena Sean Cross 2014-12-22 8:32 ` [PATCH v2 1/4] drm/panel: simple: Add Innolux N133HSE panel support Sean Cross @ 2014-12-22 8:32 ` Sean Cross 2014-12-26 21:00 ` Rob Herring 2014-12-22 8:32 ` [PATCH v2 3/4] PCI: imx6: Add power-supply support Sean Cross [not found] ` <1419237127-21763-1-git-send-email-xobs-nXMMniAx+RbQT0dZR+AlfA@public.gmane.org> 3 siblings, 1 reply; 13+ messages in thread From: Sean Cross @ 2014-12-22 8:32 UTC (permalink / raw) To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Lucas Stach, Shawn Guo, Bjorn Helgaas, devicetree, Richard Zhu, Grant Likely, linux-pci Cc: bunnie, Sean Cross Add a vendor prefix for Sutajio Ko-Usagi PTE Ltd., which goes by the more common name of Kosagi. Signed-off-by: Sean Cross <xobs@kosagi.com> --- Documentation/devicetree/bindings/vendor-prefixes.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index a344ec2..491c61b 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -81,6 +81,7 @@ isee ISEE 2007 S.L. isl Intersil karo Ka-Ro electronics GmbH keymile Keymile GmbH +kosagi Sutajio Ko-Usagi PTE Ltd. lacie LaCie lantiq Lantiq Semiconductor lenovo Lenovo Group Ltd. -- 2.1.3 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v2 2/4] devicetree: bindings: Add vendor prefix for Kosagi 2014-12-22 8:32 ` [PATCH v2 2/4] devicetree: bindings: Add vendor prefix for Kosagi Sean Cross @ 2014-12-26 21:00 ` Rob Herring 0 siblings, 0 replies; 13+ messages in thread From: Rob Herring @ 2014-12-26 21:00 UTC (permalink / raw) To: Sean Cross Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Lucas Stach, Shawn Guo, Bjorn Helgaas, devicetree@vger.kernel.org, Richard Zhu, Grant Likely, linux-pci@vger.kernel.org, bunnie On Mon, Dec 22, 2014 at 2:32 AM, Sean Cross <xobs@kosagi.com> wrote: > Add a vendor prefix for Sutajio Ko-Usagi PTE Ltd., which goes by the > more common name of Kosagi. > > Signed-off-by: Sean Cross <xobs@kosagi.com> Acked-by: Rob Herring <robh@kernel.org> > --- > Documentation/devicetree/bindings/vendor-prefixes.txt | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt > index a344ec2..491c61b 100644 > --- a/Documentation/devicetree/bindings/vendor-prefixes.txt > +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt > @@ -81,6 +81,7 @@ isee ISEE 2007 S.L. > isl Intersil > karo Ka-Ro electronics GmbH > keymile Keymile GmbH > +kosagi Sutajio Ko-Usagi PTE Ltd. > lacie LaCie > lantiq Lantiq Semiconductor > lenovo Lenovo Group Ltd. > -- > 2.1.3 > ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2 3/4] PCI: imx6: Add power-supply support 2014-12-22 8:32 [PATCH v2 0/4] Add support for kosagi novena Sean Cross 2014-12-22 8:32 ` [PATCH v2 1/4] drm/panel: simple: Add Innolux N133HSE panel support Sean Cross 2014-12-22 8:32 ` [PATCH v2 2/4] devicetree: bindings: Add vendor prefix for Kosagi Sean Cross @ 2014-12-22 8:32 ` Sean Cross 2015-01-05 9:46 ` Lucas Stach 2015-01-05 15:31 ` Arnd Bergmann [not found] ` <1419237127-21763-1-git-send-email-xobs-nXMMniAx+RbQT0dZR+AlfA@public.gmane.org> 3 siblings, 2 replies; 13+ messages in thread From: Sean Cross @ 2014-12-22 8:32 UTC (permalink / raw) To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Lucas Stach, Shawn Guo, Bjorn Helgaas, devicetree, Richard Zhu, Grant Likely, linux-pci Cc: bunnie, Sean Cross Some PCIe ports gate power to the slot. In order to prevent system lockup, these boards must enable power to the slot before attempting communication over the PCI bus. Signed-off-by: Sean Cross <xobs@kosagi.com> --- .../devicetree/bindings/pci/fsl,imx6q-pcie.txt | 3 +++ drivers/pci/host/pci-imx6.c | 27 ++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt index 6fbba53..a806b68 100644 --- a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt +++ b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt @@ -13,6 +13,9 @@ Required properties: - clock-names: Must include the following additional entries: - "pcie_phy" +Optional properties: +- bus-supply: A regulator that controls power to the entire bus + Example: pcie@0x01000000 { diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c index 69202d1..8e4f957 100644 --- a/drivers/pci/host/pci-imx6.c +++ b/drivers/pci/host/pci-imx6.c @@ -22,6 +22,7 @@ #include <linux/pci.h> #include <linux/platform_device.h> #include <linux/regmap.h> +#include <linux/regulator/consumer.h> #include <linux/resource.h> #include <linux/signal.h> #include <linux/types.h> @@ -39,6 +40,7 @@ struct imx6_pcie { struct pcie_port pp; struct regmap *iomuxc_gpr; void __iomem *mem_base; + struct regulator *bus_supply; }; /* PCIe Root Complex registers (memory-mapped) */ @@ -523,6 +525,7 @@ static struct pcie_host_ops imx6_pcie_host_ops = { static int __init imx6_add_pcie_port(struct pcie_port *pp, struct platform_device *pdev) { + struct imx6_pcie *imx6_pcie = to_imx6_pcie(pp); int ret; if (IS_ENABLED(CONFIG_PCI_MSI)) { @@ -544,9 +547,22 @@ static int __init imx6_add_pcie_port(struct pcie_port *pp, pp->root_bus_nr = -1; pp->ops = &imx6_pcie_host_ops; + if (imx6_pcie->bus_supply) { + ret = regulator_enable(imx6_pcie->bus_supply); + if (ret) { + dev_err(pp->dev, + "unable to enable bus supply: %d\n", ret); + return ret; + } + } + ret = dw_pcie_host_init(pp); if (ret) { dev_err(&pdev->dev, "failed to initialize host\n"); + + if (imx6_pcie->bus_supply) + regulator_disable(imx6_pcie->bus_supply); + return ret; } @@ -588,6 +604,17 @@ static int __init imx6_pcie_probe(struct platform_device *pdev) } } + /* Fetch bus supply */ + imx6_pcie->bus_supply = devm_regulator_get_optional(&pdev->dev, "bus"); + if (IS_ERR(imx6_pcie->bus_supply)) { + ret = PTR_ERR(imx6_pcie->bus_supply); + if (ret == -EPROBE_DEFER) + return ret; + + dev_err(&pdev->dev, "unable to get bus-supply\n"); + return ret; + } + /* Fetch clocks */ imx6_pcie->pcie_phy = devm_clk_get(&pdev->dev, "pcie_phy"); if (IS_ERR(imx6_pcie->pcie_phy)) { -- 2.1.3 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v2 3/4] PCI: imx6: Add power-supply support 2014-12-22 8:32 ` [PATCH v2 3/4] PCI: imx6: Add power-supply support Sean Cross @ 2015-01-05 9:46 ` Lucas Stach 2015-01-05 15:31 ` Arnd Bergmann 1 sibling, 0 replies; 13+ messages in thread From: Lucas Stach @ 2015-01-05 9:46 UTC (permalink / raw) To: Sean Cross Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Shawn Guo, Bjorn Helgaas, devicetree, Richard Zhu, Grant Likely, linux-pci, bunnie Am Montag, den 22.12.2014, 16:32 +0800 schrieb Sean Cross: > Some PCIe ports gate power to the slot. In order to prevent system lockup, > these boards must enable power to the slot before attempting communication > over the PCI bus. > > Signed-off-by: Sean Cross <xobs@kosagi.com> Reviewed-by: Lucas Stach <l.stach@pengutronix.de> > --- > .../devicetree/bindings/pci/fsl,imx6q-pcie.txt | 3 +++ > drivers/pci/host/pci-imx6.c | 27 ++++++++++++++++++++++ > 2 files changed, 30 insertions(+) > > diff --git a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt > index 6fbba53..a806b68 100644 > --- a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt > +++ b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt > @@ -13,6 +13,9 @@ Required properties: > - clock-names: Must include the following additional entries: > - "pcie_phy" > > +Optional properties: > +- bus-supply: A regulator that controls power to the entire bus > + > Example: > > pcie@0x01000000 { > diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c > index 69202d1..8e4f957 100644 > --- a/drivers/pci/host/pci-imx6.c > +++ b/drivers/pci/host/pci-imx6.c > @@ -22,6 +22,7 @@ > #include <linux/pci.h> > #include <linux/platform_device.h> > #include <linux/regmap.h> > +#include <linux/regulator/consumer.h> > #include <linux/resource.h> > #include <linux/signal.h> > #include <linux/types.h> > @@ -39,6 +40,7 @@ struct imx6_pcie { > struct pcie_port pp; > struct regmap *iomuxc_gpr; > void __iomem *mem_base; > + struct regulator *bus_supply; > }; > > /* PCIe Root Complex registers (memory-mapped) */ > @@ -523,6 +525,7 @@ static struct pcie_host_ops imx6_pcie_host_ops = { > static int __init imx6_add_pcie_port(struct pcie_port *pp, > struct platform_device *pdev) > { > + struct imx6_pcie *imx6_pcie = to_imx6_pcie(pp); > int ret; > > if (IS_ENABLED(CONFIG_PCI_MSI)) { > @@ -544,9 +547,22 @@ static int __init imx6_add_pcie_port(struct pcie_port *pp, > pp->root_bus_nr = -1; > pp->ops = &imx6_pcie_host_ops; > > + if (imx6_pcie->bus_supply) { > + ret = regulator_enable(imx6_pcie->bus_supply); > + if (ret) { > + dev_err(pp->dev, > + "unable to enable bus supply: %d\n", ret); > + return ret; > + } > + } > + > ret = dw_pcie_host_init(pp); > if (ret) { > dev_err(&pdev->dev, "failed to initialize host\n"); > + > + if (imx6_pcie->bus_supply) > + regulator_disable(imx6_pcie->bus_supply); > + > return ret; > } > > @@ -588,6 +604,17 @@ static int __init imx6_pcie_probe(struct platform_device *pdev) > } > } > > + /* Fetch bus supply */ > + imx6_pcie->bus_supply = devm_regulator_get_optional(&pdev->dev, "bus"); > + if (IS_ERR(imx6_pcie->bus_supply)) { > + ret = PTR_ERR(imx6_pcie->bus_supply); > + if (ret == -EPROBE_DEFER) > + return ret; > + > + dev_err(&pdev->dev, "unable to get bus-supply\n"); > + return ret; > + } > + > /* Fetch clocks */ > imx6_pcie->pcie_phy = devm_clk_get(&pdev->dev, "pcie_phy"); > if (IS_ERR(imx6_pcie->pcie_phy)) { -- Pengutronix e.K. | Lucas Stach | Industrial Linux Solutions | http://www.pengutronix.de/ | ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 3/4] PCI: imx6: Add power-supply support 2014-12-22 8:32 ` [PATCH v2 3/4] PCI: imx6: Add power-supply support Sean Cross 2015-01-05 9:46 ` Lucas Stach @ 2015-01-05 15:31 ` Arnd Bergmann 1 sibling, 0 replies; 13+ messages in thread From: Arnd Bergmann @ 2015-01-05 15:31 UTC (permalink / raw) To: Sean Cross Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Lucas Stach, Shawn Guo, Bjorn Helgaas, devicetree, Richard Zhu, Grant Likely, linux-pci, bunnie On Monday 22 December 2014 16:32:06 Sean Cross wrote: > Some PCIe ports gate power to the slot. In order to prevent system lockup, > these boards must enable power to the slot before attempting communication > over the PCI bus. > > Signed-off-by: Sean Cross <xobs@kosagi.com> Could this be moved to the common pcie-designware driver? It doesn't seem to be imx6 specific and other drivers might need the same thing. Arnd ^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <1419237127-21763-1-git-send-email-xobs-nXMMniAx+RbQT0dZR+AlfA@public.gmane.org>]
* [PATCH v2 4/4] ARM: dts: imx6q: add Novena board [not found] ` <1419237127-21763-1-git-send-email-xobs-nXMMniAx+RbQT0dZR+AlfA@public.gmane.org> @ 2014-12-22 8:32 ` Sean Cross 2015-01-19 10:04 ` Lucas Stach 2015-01-16 0:46 ` [PATCH v2 0/4] Add support for kosagi novena Bjorn Helgaas 1 sibling, 1 reply; 13+ messages in thread From: Sean Cross @ 2014-12-22 8:32 UTC (permalink / raw) To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Lucas Stach, Shawn Guo, Bjorn Helgaas, devicetree-u79uwXL29TY76Z2rM5mHXA, Richard Zhu, Grant Likely, linux-pci-u79uwXL29TY76Z2rM5mHXA Cc: bunnie-nXMMniAx+RbQT0dZR+AlfA, Sean Cross Novena is an open-hardware laptop/desktop/bare board. See http://www.kosagi.com/w/index.php?title=Novena_Main_Page This device tree contains additional nodes for FPGA support. Signed-off-by: Sean Cross <xobs-nXMMniAx+RbQT0dZR+AlfA@public.gmane.org> --- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/imx6q-novena.dts | 856 +++++++++++++++++++++++++++++++++++++ 2 files changed, 857 insertions(+) create mode 100644 arch/arm/boot/dts/imx6q-novena.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 38c89ca..b2b4770 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -234,6 +234,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ imx6q-gw552x.dtb \ imx6q-hummingboard.dtb \ imx6q-nitrogen6x.dtb \ + imx6q-novena.dtb \ imx6q-phytec-pbab01.dtb \ imx6q-rex-pro.dtb \ imx6q-sabreauto.dtb \ diff --git a/arch/arm/boot/dts/imx6q-novena.dts b/arch/arm/boot/dts/imx6q-novena.dts new file mode 100644 index 0000000..d4a3a06 --- /dev/null +++ b/arch/arm/boot/dts/imx6q-novena.dts @@ -0,0 +1,856 @@ +/* + * Copyright 2014 Sutajio Ko-Usagi PTE LTD + * Copyright 2012 Freescale Semiconductor, Inc. + * Copyright 2011 Linaro Ltd. + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +#include "imx6q.dtsi" +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> + +/ { + model = "Kosagi Novena Dual/Quad"; + compatible = "kosagi,imx6q-novena", "fsl,imx6q"; + + memory { + reg = <0x10000000 0xefffffff>; + }; + + chosen { + stdout-path = &uart2; + }; + + regulators { + compatible = "simple-bus"; + + reg_2p5v: 2p5v { + compatible = "regulator-fixed"; + regulator-name = "2P5V"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-always-on; + }; + + reg_3p3v: 3p3v { + compatible = "regulator-fixed"; + regulator-name = "3P3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + reg_usb_otg_vbus: usb_otg_vbus { + compatible = "regulator-fixed"; + regulator-name = "usb_otg_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + }; + + reg_audio_codec: es8328-regulator { + compatible = "regulator-fixed"; + regulator-name = "es8328-power"; + regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + startup-delay-us = <400000>; + gpio = <&gpio5 17 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + reg_pcie: pcie-regulator { + compatible = "regulator-fixed"; + regulator-name = "pcie-bus-power"; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1500000>; + gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + reg_lvds_lcd: lcd-regulator { + compatible = "regulator-fixed"; + regulator-name = "lcd-lvds-power"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + reg_display: display-regulator { + compatible = "regulator-fixed"; + regulator-name = "lcd-display-power"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + startup-delay-us = <200000>; + gpio = <&gpio5 28 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + reg_sata: sata-regulator { + compatible = "regulator-fixed"; + regulator-name = "sata-power"; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + startup-delay-us = <10000>; + gpio = <&gpio3 30 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + }; + + gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_keys_novena>; + + user-button { + label = "User Button"; + gpios = <&gpio4 14 GPIO_ACTIVE_LOW>; + linux,code = <KEY_POWER>; + }; + + lid { + label = "Lid"; + gpios = <&gpio4 12 GPIO_ACTIVE_LOW>; + linux,input-type = <5>; /* EV_SW */ + linux,code = <0>; /* SW_LID */ + }; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_leds_novena>; + + heartbeat { + label = "novena:white:panel"; + gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "default-on"; + }; + }; + + backlight: backlight { + compatible = "pwm-backlight"; + pwms = <&pwm1 0 10000000>; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_backlight_novena>; + power-supply = <®_lvds_lcd>; + + brightness-levels = <0 3 6 12 16 24 32 48 64 96 128 192 255>; + default-brightness-level = <12>; + }; + + panel: panel { + compatible = "innolux,n133hse-ea1", "simple-panel"; + backlight = <&backlight>; + }; + + sound { + compatible = "fsl,imx-audio-es8328"; + model = "imx-audio-es8328"; + ssi-controller = <&ssi1>; + audio-codec = <&codec>; + audio-amp-supply = <®_audio_codec>; + jack-gpio = <&gpio5 15 GPIO_ACTIVE_HIGH>; + audio-routing = + "Speaker", "LOUT2", + "Speaker", "ROUT2", + "Speaker", "audio-amp", + "Headphone", "ROUT1", + "Headphone", "LOUT1", + "LINPUT1", "Mic Jack", + "RINPUT1", "Mic Jack", + "Mic Jack", "Mic Bias"; + mux-int-port = <0x1>; + mux-ext-port = <0x3>; + }; +}; + +&audmux { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_audmux_novena>; + status = "okay"; +}; + +&fec { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_enet_novena>; + phy-mode = "rgmii"; + phy-reset-gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>; + mac-address = [00 00 00 00 00 00]; + rxc-skew-ps = <3000>; + rxdv-skew-ps = <0>; + txc-skew-ps = <3000>; + txen-skew-ps = <0>; + rxd0-skew-ps = <0>; + rxd1-skew-ps = <0>; + rxd2-skew-ps = <0>; + rxd3-skew-ps = <0>; + txd0-skew-ps = <3000>; + txd1-skew-ps = <3000>; + txd2-skew-ps = <3000>; + txd3-skew-ps = <3000>; + status = "okay"; +}; + +&ecspi3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ecspi3_novena>; + fsl,spi-num-chipselects = <3>; + status = "okay"; + + spidev@0 { + compatible = "spidev"; + spi-max-frequency = <30000000>; + reg = <0>; + }; +}; + +&hdmi { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hdmi_novena>; + ddc-i2c-bus = <&i2c2>; + status = "okay"; +}; + +&i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c1_novena>; + status = "okay"; + + sbs_battery: bq20z75@0b { + compatible = "sbs,sbs-battery"; + reg = <0x0b>; + sbs,i2c-retry-count = <50>; + }; + + senoko: senoko@20 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_senoko_novena>; + compatible = "kosagi,senoko"; + reg = <0x20>; + irq-gpio = <&gpio1 20 GPIO_ACTIVE_HIGH>; + supplied-to = "sbs-0-000b"; + }; + + stmpe811@44 { + compatible = "st,stmpe811"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x44>; + irq-gpio = <&gpio5 13 GPIO_ACTIVE_HIGH>; + id = <0>; + blocks = <0x5>; + irq-trigger = <0x1>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_stmpe_novena>; + vio-supply = <®_3p3v>; + vcc-supply = <®_3p3v>; + + stmpe_touchscreen { + compatible = "st,stmpe-ts"; + ts,sample-time = <4>; + ts,mod-12b = <1>; + ts,ref-sel = <0>; + ts,adc-freq = <1>; + ts,ave-ctrl = <1>; + ts,touch-det-delay = <2>; + ts,settling = <2>; + ts,fraction-z = <7>; + ts,i-drive = <1>; + }; + + }; + + accel: mma8452@1c { + compatible = "fsl,mma8452"; + reg = <0x1c>; + }; + + rtc: pcf8523@68 { + compatible = "nxp,pcf8523"; + reg = <0x68>; + }; +}; + +&i2c2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c2_novena>; + status = "okay"; + + pmic: pfuze100@08 { + compatible = "fsl,pfuze100"; + reg = <0x08>; + + regulators { + sw1a_reg: sw1ab { + regulator-min-microvolt = <300000>; + regulator-max-microvolt = <1875000>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + sw1c_reg: sw1c { + regulator-min-microvolt = <300000>; + regulator-max-microvolt = <1875000>; + regulator-boot-on; + regulator-always-on; + }; + + sw2_reg: sw2 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + }; + + sw3a_reg: sw3a { + regulator-min-microvolt = <400000>; + regulator-max-microvolt = <1975000>; + regulator-boot-on; + regulator-always-on; + }; + + sw3b_reg: sw3b { + regulator-min-microvolt = <400000>; + regulator-max-microvolt = <1975000>; + regulator-boot-on; + regulator-always-on; + }; + + sw4_reg: sw4 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + }; + + swbst_reg: swbst { + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5150000>; + regulator-boot-on; + }; + + snvs_reg: vsnvs { + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <3000000>; + regulator-boot-on; + regulator-always-on; + }; + + vref_reg: vrefddr { + regulator-boot-on; + regulator-always-on; + }; + + vgen1_reg: vgen1 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1550000>; + }; + + vgen2_reg: vgen2 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1550000>; + }; + + vgen3_reg: vgen3 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + }; + + vgen4_reg: vgen4 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vgen5_reg: vgen5 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vgen6_reg: vgen6 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + }; + }; +}; + +&i2c3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3_novena>; + status = "okay"; + + codec: es8328@11 { + compatible = "everest,es8328"; + reg = <0x11>; + DVDD-supply = <®_audio_codec>; + AVDD-supply = <®_audio_codec>; + PVDD-supply = <®_audio_codec>; + HPVDD-supply = <®_audio_codec>; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sound_novena>; + + clocks = <&clks IMX6QDL_CLK_CKO1>; + assigned-clocks = <&clks IMX6QDL_CLK_CKO>, <&clks IMX6QDL_CLK_CKO1_SEL>, <&clks IMX6QDL_CLK_PLL4_AUDIO>, <&clks IMX6QDL_CLK_CKO1>; + assigned-clock-parents = <&clks IMX6QDL_CLK_CKO1>, <&clks IMX6QDL_CLK_PLL4_AUDIO_DIV>, <&clks IMX6QDL_CLK_OSC>, <&clks IMX6QDL_CLK_CKO1_PODF>; + assigned-clock-rates = <0 0 722534400 22579200>; + }; + + eepromoops@56 { + compatible = "kosagi,eepromoops"; + reg = <0x56>; + }; + + it6251@5c { + compatible = "it,it6251"; + reg = <0x5c>; + power-supply = <®_display>; + }; +}; + +&iomuxc { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hog>; + + audmux { + pinctrl_audmux_novena: audmuxgrp-novena { + fsl,pins = < + MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x80000000 + MX6QDL_PAD_CSI0_DAT4__AUD3_TXC 0x80000000 + MX6QDL_PAD_CSI0_DAT5__AUD3_TXD 0x80000000 + MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS 0x80000000 + >; + }; + }; + + kpp-keys { + pinctrl_kpp_novena: kppgrp-novena { + fsl,pins = < + /* Front panel button */ + MX6QDL_PAD_KEY_ROW1__KEY_ROW1 0x1b0b1 + + /* Fake column driver, not connected to anything */ + MX6QDL_PAD_KEY_COL1__KEY_COL1 0x1b0b1 + >; + }; + }; + + backlight { + pinctrl_backlight_novena: backlightgrp-novena { + fsl,pins = < + MX6QDL_PAD_DISP0_DAT8__PWM1_OUT 0x1b0b0 + MX6QDL_PAD_CSI0_DAT10__GPIO5_IO28 0x80000000 + MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x80000000 + >; + }; + }; + + ecspi3 { + pinctrl_ecspi3_novena: ecspi3grp-novena { + fsl,pins = < + MX6QDL_PAD_DISP0_DAT2__ECSPI3_MISO 0x100b1 + MX6QDL_PAD_DISP0_DAT1__ECSPI3_MOSI 0x100b1 + MX6QDL_PAD_DISP0_DAT0__ECSPI3_SCLK 0x100b1 + >; + }; + }; + + enet { + pinctrl_enet_novena: enetgrp-novena { + fsl,pins = < + MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0 + MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0 + MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b020 + MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b028 + MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b028 + MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b028 + MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b028 + MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b028 + MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0 + MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0 + MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0 + MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0 + MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0 + MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0 + MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0 + MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8 + + /* Ethernet reset */ + MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x80000000 + >; + }; + }; + + gpio_keys { + pinctrl_gpio_keys_novena: gpiokeysgrp-novena { + fsl,pins = < + /* User button */ + MX6QDL_PAD_KEY_COL4__GPIO4_IO14 0x1b0b0 + + /* PCIe Wakeup */ + MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1f0e0 + + /* Lid switch */ + MX6QDL_PAD_KEY_COL3__GPIO4_IO12 0x1b0b0 + >; + }; + }; + + hdmi { + pinctrl_hdmi_novena: hdmigrp-novena { + fsl,pins = < + MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0 + MX6QDL_PAD_EIM_A24__GPIO5_IO04 0x80000000 + >; + }; + }; + + i2c1 { + pinctrl_i2c1_novena: i2c1grp-novena { + fsl,pins = < + MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1 + MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1 + >; + }; + }; + + i2c2 { + pinctrl_i2c2_novena: i2c2grp-novena { + fsl,pins = < + MX6QDL_PAD_EIM_EB2__I2C2_SCL 0x4001b8b1 + MX6QDL_PAD_EIM_D16__I2C2_SDA 0x4001b8b1 + >; + }; + }; + + i2c3 { + pinctrl_i2c3_novena: i2c3grp-novena { + fsl,pins = < + MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1 + MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1 + >; + }; + }; + + leds { + pinctrl_leds_novena: ledsgrp-novena { + fsl,pins = < + MX6QDL_PAD_SD1_DAT3__GPIO1_IO21 0x80000000 + >; + }; + }; + + fpga { + pinctrl_fpga_gpio: fpgagpiogrp-novena { + fsl,pins = < + /* FPGA power */ + MX6QDL_PAD_SD1_DAT1__GPIO1_IO17 0x80000000 + + /* Reset */ + MX6QDL_PAD_DISP0_DAT13__GPIO5_IO07 0x80000000 + + /* FPGA GPIOs */ + MX6QDL_PAD_EIM_DA0__GPIO3_IO00 0x80000000 + MX6QDL_PAD_EIM_DA1__GPIO3_IO01 0x80000000 + MX6QDL_PAD_EIM_DA2__GPIO3_IO02 0x80000000 + MX6QDL_PAD_EIM_DA3__GPIO3_IO03 0x80000000 + MX6QDL_PAD_EIM_DA4__GPIO3_IO04 0x80000000 + MX6QDL_PAD_EIM_DA5__GPIO3_IO05 0x80000000 + MX6QDL_PAD_EIM_DA6__GPIO3_IO06 0x80000000 + MX6QDL_PAD_EIM_DA7__GPIO3_IO07 0x80000000 + MX6QDL_PAD_EIM_DA8__GPIO3_IO08 0x80000000 + MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x80000000 + MX6QDL_PAD_EIM_DA10__GPIO3_IO10 0x80000000 + MX6QDL_PAD_EIM_DA11__GPIO3_IO11 0x80000000 + MX6QDL_PAD_EIM_DA12__GPIO3_IO12 0x80000000 + MX6QDL_PAD_EIM_DA13__GPIO3_IO13 0x80000000 + MX6QDL_PAD_EIM_DA14__GPIO3_IO14 0x80000000 + MX6QDL_PAD_EIM_DA15__GPIO3_IO15 0x80000000 + MX6QDL_PAD_EIM_A16__GPIO2_IO22 0x80000000 + MX6QDL_PAD_EIM_A17__GPIO2_IO21 0x80000000 + MX6QDL_PAD_EIM_A18__GPIO2_IO20 0x80000000 + MX6QDL_PAD_EIM_CS0__GPIO2_IO23 0x80000000 + MX6QDL_PAD_EIM_CS1__GPIO2_IO24 0x80000000 + MX6QDL_PAD_EIM_LBA__GPIO2_IO27 0x80000000 + MX6QDL_PAD_EIM_OE__GPIO2_IO25 0x80000000 + MX6QDL_PAD_EIM_RW__GPIO2_IO26 0x80000000 + MX6QDL_PAD_EIM_WAIT__GPIO5_IO00 0x80000000 + MX6QDL_PAD_EIM_BCLK__GPIO6_IO31 0x80000000 + >; + }; + + pinctrl_fpga_eim: fpgaeimgrp-novena { + fsl,pins = < + /* FPGA power */ + MX6QDL_PAD_SD1_DAT1__GPIO1_IO17 0x80000000 + + /* Reset */ + MX6QDL_PAD_DISP0_DAT13__GPIO5_IO07 0x80000000 + + /* FPGA GPIOs */ + MX6QDL_PAD_EIM_DA0__EIM_AD00 0xb0f1 + MX6QDL_PAD_EIM_DA1__EIM_AD01 0xb0f1 + MX6QDL_PAD_EIM_DA2__EIM_AD02 0xb0f1 + MX6QDL_PAD_EIM_DA3__EIM_AD03 0xb0f1 + MX6QDL_PAD_EIM_DA4__EIM_AD04 0xb0f1 + MX6QDL_PAD_EIM_DA5__EIM_AD05 0xb0f1 + MX6QDL_PAD_EIM_DA6__EIM_AD06 0xb0f1 + MX6QDL_PAD_EIM_DA7__EIM_AD07 0xb0f1 + MX6QDL_PAD_EIM_DA8__EIM_AD08 0xb0f1 + MX6QDL_PAD_EIM_DA9__EIM_AD09 0xb0f1 + MX6QDL_PAD_EIM_DA10__EIM_AD10 0xb0f1 + MX6QDL_PAD_EIM_DA11__EIM_AD11 0xb0f1 + MX6QDL_PAD_EIM_DA12__EIM_AD12 0xb0f1 + MX6QDL_PAD_EIM_DA13__EIM_AD13 0xb0f1 + MX6QDL_PAD_EIM_DA14__EIM_AD14 0xb0f1 + MX6QDL_PAD_EIM_DA15__EIM_AD15 0xb0f1 + MX6QDL_PAD_EIM_A16__EIM_ADDR16 0xb0f1 + MX6QDL_PAD_EIM_A17__EIM_ADDR17 0xb0f1 + MX6QDL_PAD_EIM_A18__EIM_ADDR18 0xb0f1 + MX6QDL_PAD_EIM_CS0__EIM_CS0_B 0xb0f1 + MX6QDL_PAD_EIM_CS1__EIM_CS1_B 0xb0f1 + MX6QDL_PAD_EIM_LBA__EIM_LBA_B 0xb0f1 + MX6QDL_PAD_EIM_OE__EIM_OE_B 0xb0f1 + MX6QDL_PAD_EIM_RW__EIM_RW 0xb0f1 + MX6QDL_PAD_EIM_WAIT__EIM_WAIT_B 0xb0f1 + MX6QDL_PAD_EIM_BCLK__EIM_BCLK 0xb0f1 + >; + }; + }; + + hog { + pinctrl_hog: hoggrp-novena { + fsl,pins = < + /* Peek array power */ + MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000 + >; + }; + }; + + pcie { + pinctrl_pcie_novena: pciegrp-novena { + fsl,pins = < + /* Reset */ + MX6QDL_PAD_EIM_D29__GPIO3_IO29 0x80000000 + + /* Power On */ + MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000 + + /* Wifi kill */ + MX6QDL_PAD_EIM_A22__GPIO2_IO16 0x80000000 + >; + }; + }; + + sata { + pinctrl_sata_novena: satagrp-novena { + fsl,pins = < + MX6QDL_PAD_EIM_D30__GPIO3_IO30 0x80000000 + >; + }; + }; + + senoko { + pinctrl_senoko_novena: senokogrp-novena { + fsl,pins = < + /* Senoko IRQ line */ + MX6QDL_PAD_SD1_CLK__GPIO1_IO20 0x13048 + + /* Senoko reset line */ + MX6QDL_PAD_CSI0_VSYNC__GPIO5_IO21 0x80000000 + >; + }; + }; + + sound { + pinctrl_sound_novena: soundgrp-novena { + fsl,pins = < + /* Audio power regulator */ + MX6QDL_PAD_DISP0_DAT23__GPIO5_IO17 0x80000000 + + /* Headphone plug */ + MX6QDL_PAD_DISP0_DAT21__GPIO5_IO15 0x80000000 + + MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x80000000 + >; + }; + }; + + ts { + pinctrl_stmpe_novena: stmpegrp-novena { + fsl,pins = < + /* Touchscreen interrupt */ + MX6QDL_PAD_DISP0_DAT19__GPIO5_IO13 0x80000000 + >; + }; + }; + + uart2 { + pinctrl_uart2_novena: uart2grp-novena { + fsl,pins = < + MX6QDL_PAD_EIM_D26__UART2_TX_DATA 0x1b0b1 + MX6QDL_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1 + >; + }; + }; + + uart3 { + pinctrl_uart3_novena: uart3grp-novena { + fsl,pins = < + MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1 + MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1 + >; + }; + }; + uart4 { + pinctrl_uart4_novena: uart4grp-novena { + fsl,pins = < + MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA 0x1b0b1 + MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1 + >; + }; + }; + + usbotg { + pinctrl_usbotg_novena: usbotggrp-novena { + fsl,pins = < + MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059 + >; + }; + }; + + usdhc2 { + pinctrl_usdhc2_novena: usdhc2grp-novena { + 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 0x17059 + + /* Write protect */ + MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000 + + /* Card detect */ + MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x80000000 + >; + }; + }; + + usdhc3 { + pinctrl_usdhc3_novena: usdhc3grp-novena { + 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 + >; + }; + }; +}; + +&kpp { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_kpp_novena>; + linux,keymap = < + MATRIX_KEY(1, 1, KEY_CONFIG) + >; + wakeup; + status = "okay"; +}; + +&ldb { + fsl,dual-channel; + status = "okay"; + lvds-channel@0 { + fsl,data-mapping = "jeida"; + fsl,data-width = <24>; + fsl,panel = <&panel>; + status = "okay"; + }; +}; + +&pcie { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pcie_novena>; + reset-gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>; + bus-supply = <®_pcie>; + status = "okay"; +}; + +&sata { + target-supply = <®_sata>; + fsl,transmit-level-mV = <1025>; + fsl,transmit-boost-mdB = <0>; + fsl,transmit-atten-16ths = <8>; + status = "okay"; +}; + +&ssi1 { + fsl,mode = "i2s-slave"; + status = "okay"; +}; + +&uart2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart2_novena>; + status = "okay"; +}; + +&uart3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart3_novena>; + status = "okay"; +}; + +&uart4 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart4_novena>; + status = "okay"; +}; + +&usbotg { + vbus-supply = <®_usb_otg_vbus>; + dr_mode = "otg"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbotg_novena>; + disable-over-current; + status = "okay"; +}; + +&usbh1 { + vbus-supply = <&swbst_reg>; + status = "okay"; +}; + +&usdhc2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc2_1>; + pinctrl-0 = <&pinctrl_usdhc2_novena>; + cd-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; + wp-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + +&usdhc3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc3_novena>; + non-removable; + status = "okay"; +}; -- 2.1.3 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v2 4/4] ARM: dts: imx6q: add Novena board 2014-12-22 8:32 ` [PATCH v2 4/4] ARM: dts: imx6q: add Novena board Sean Cross @ 2015-01-19 10:04 ` Lucas Stach 2015-01-30 6:48 ` Sean Cross 0 siblings, 1 reply; 13+ messages in thread From: Lucas Stach @ 2015-01-19 10:04 UTC (permalink / raw) To: Sean Cross Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Shawn Guo, Bjorn Helgaas, devicetree, Richard Zhu, Grant Likely, linux-pci, bunnie Am Montag, den 22.12.2014, 16:32 +0800 schrieb Sean Cross: > Novena is an open-hardware laptop/desktop/bare board. > > See http://www.kosagi.com/w/index.php?title=Novena_Main_Page > > This device tree contains additional nodes for FPGA support. > > Signed-off-by: Sean Cross <xobs@kosagi.com> Some remarks inline. Otherwise looks good to me. Regards, Lucas > --- > arch/arm/boot/dts/Makefile | 1 + > arch/arm/boot/dts/imx6q-novena.dts | 856 +++++++++++++++++++++++++++++++++++++ > 2 files changed, 857 insertions(+) > create mode 100644 arch/arm/boot/dts/imx6q-novena.dts > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index 38c89ca..b2b4770 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -234,6 +234,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ > imx6q-gw552x.dtb \ > imx6q-hummingboard.dtb \ > imx6q-nitrogen6x.dtb \ > + imx6q-novena.dtb \ > imx6q-phytec-pbab01.dtb \ > imx6q-rex-pro.dtb \ > imx6q-sabreauto.dtb \ > diff --git a/arch/arm/boot/dts/imx6q-novena.dts b/arch/arm/boot/dts/imx6q-novena.dts > new file mode 100644 > index 0000000..d4a3a06 > --- /dev/null > +++ b/arch/arm/boot/dts/imx6q-novena.dts > @@ -0,0 +1,856 @@ > +/* > + * Copyright 2014 Sutajio Ko-Usagi PTE LTD > + * Copyright 2012 Freescale Semiconductor, Inc. > + * Copyright 2011 Linaro Ltd. > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 or later at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + */ > + > +/dts-v1/; > +#include "imx6q.dtsi" > +#include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/input/input.h> > + > +/ { > + model = "Kosagi Novena Dual/Quad"; > + compatible = "kosagi,imx6q-novena", "fsl,imx6q"; > + > + memory { > + reg = <0x10000000 0xefffffff>; > + }; > + > + chosen { > + stdout-path = &uart2; > + }; > + > + regulators { > + compatible = "simple-bus"; > + I know it is common practice in many DTs, but this "bus" is completely unnecessary and we should stop using this pattern for new DTs. Please move those regulators directly into the parent node. > + reg_2p5v: 2p5v { > + compatible = "regulator-fixed"; > + regulator-name = "2P5V"; > + regulator-min-microvolt = <2500000>; > + regulator-max-microvolt = <2500000>; > + regulator-always-on; > + }; > + > + reg_3p3v: 3p3v { > + compatible = "regulator-fixed"; > + regulator-name = "3P3V"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + }; > + > + reg_usb_otg_vbus: usb_otg_vbus { > + compatible = "regulator-fixed"; > + regulator-name = "usb_otg_vbus"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + enable-active-high; > + }; > + > + reg_audio_codec: es8328-regulator { > + compatible = "regulator-fixed"; > + regulator-name = "es8328-power"; > + regulator-boot-on; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + startup-delay-us = <400000>; > + gpio = <&gpio5 17 GPIO_ACTIVE_HIGH>; > + enable-active-high; > + }; > + > + reg_pcie: pcie-regulator { > + compatible = "regulator-fixed"; > + regulator-name = "pcie-bus-power"; > + regulator-min-microvolt = <1500000>; > + regulator-max-microvolt = <1500000>; > + gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>; > + enable-active-high; > + }; > + > + reg_lvds_lcd: lcd-regulator { > + compatible = "regulator-fixed"; > + regulator-name = "lcd-lvds-power"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>; > + enable-active-high; > + }; > + > + reg_display: display-regulator { > + compatible = "regulator-fixed"; > + regulator-name = "lcd-display-power"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + startup-delay-us = <200000>; > + gpio = <&gpio5 28 GPIO_ACTIVE_HIGH>; > + enable-active-high; > + }; > + > + reg_sata: sata-regulator { > + compatible = "regulator-fixed"; > + regulator-name = "sata-power"; > + regulator-boot-on; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + startup-delay-us = <10000>; > + gpio = <&gpio3 30 GPIO_ACTIVE_HIGH>; > + enable-active-high; > + }; > + }; > + > + gpio-keys { > + compatible = "gpio-keys"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_gpio_keys_novena>; > + > + user-button { > + label = "User Button"; > + gpios = <&gpio4 14 GPIO_ACTIVE_LOW>; > + linux,code = <KEY_POWER>; > + }; > + > + lid { > + label = "Lid"; > + gpios = <&gpio4 12 GPIO_ACTIVE_LOW>; > + linux,input-type = <5>; /* EV_SW */ > + linux,code = <0>; /* SW_LID */ > + }; > + }; > + > + leds { > + compatible = "gpio-leds"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_leds_novena>; > + > + heartbeat { > + label = "novena:white:panel"; > + gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>; > + linux,default-trigger = "default-on"; > + }; > + }; > + > + backlight: backlight { > + compatible = "pwm-backlight"; > + pwms = <&pwm1 0 10000000>; > + > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_backlight_novena>; > + power-supply = <®_lvds_lcd>; > + > + brightness-levels = <0 3 6 12 16 24 32 48 64 96 128 192 255>; > + default-brightness-level = <12>; > + }; > + > + panel: panel { > + compatible = "innolux,n133hse-ea1", "simple-panel"; > + backlight = <&backlight>; > + }; > + > + sound { > + compatible = "fsl,imx-audio-es8328"; > + model = "imx-audio-es8328"; > + ssi-controller = <&ssi1>; > + audio-codec = <&codec>; > + audio-amp-supply = <®_audio_codec>; > + jack-gpio = <&gpio5 15 GPIO_ACTIVE_HIGH>; > + audio-routing = > + "Speaker", "LOUT2", > + "Speaker", "ROUT2", > + "Speaker", "audio-amp", > + "Headphone", "ROUT1", > + "Headphone", "LOUT1", > + "LINPUT1", "Mic Jack", > + "RINPUT1", "Mic Jack", > + "Mic Jack", "Mic Bias"; > + mux-int-port = <0x1>; > + mux-ext-port = <0x3>; > + }; > +}; > + > +&audmux { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_audmux_novena>; > + status = "okay"; > +}; > + > +&fec { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_enet_novena>; > + phy-mode = "rgmii"; > + phy-reset-gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>; > + mac-address = [00 00 00 00 00 00]; > + rxc-skew-ps = <3000>; > + rxdv-skew-ps = <0>; > + txc-skew-ps = <3000>; > + txen-skew-ps = <0>; > + rxd0-skew-ps = <0>; > + rxd1-skew-ps = <0>; > + rxd2-skew-ps = <0>; > + rxd3-skew-ps = <0>; > + txd0-skew-ps = <3000>; > + txd1-skew-ps = <3000>; > + txd2-skew-ps = <3000>; > + txd3-skew-ps = <3000>; > + status = "okay"; > +}; > + > +&ecspi3 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_ecspi3_novena>; > + fsl,spi-num-chipselects = <3>; > + status = "okay"; > + > + spidev@0 { > + compatible = "spidev"; > + spi-max-frequency = <30000000>; > + reg = <0>; > + }; > +}; > + > +&hdmi { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_hdmi_novena>; > + ddc-i2c-bus = <&i2c2>; > + status = "okay"; > +}; > + > +&i2c1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_i2c1_novena>; > + status = "okay"; > + > + sbs_battery: bq20z75@0b { > + compatible = "sbs,sbs-battery"; > + reg = <0x0b>; > + sbs,i2c-retry-count = <50>; > + }; > + > + senoko: senoko@20 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_senoko_novena>; > + compatible = "kosagi,senoko"; This is missing a binding documentation. > + reg = <0x20>; > + irq-gpio = <&gpio1 20 GPIO_ACTIVE_HIGH>; > + supplied-to = "sbs-0-000b"; > + }; > + > + stmpe811@44 { > + compatible = "st,stmpe811"; > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <0x44>; > + irq-gpio = <&gpio5 13 GPIO_ACTIVE_HIGH>; > + id = <0>; > + blocks = <0x5>; > + irq-trigger = <0x1>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_stmpe_novena>; > + vio-supply = <®_3p3v>; > + vcc-supply = <®_3p3v>; > + > + stmpe_touchscreen { > + compatible = "st,stmpe-ts"; > + ts,sample-time = <4>; > + ts,mod-12b = <1>; > + ts,ref-sel = <0>; > + ts,adc-freq = <1>; > + ts,ave-ctrl = <1>; > + ts,touch-det-delay = <2>; > + ts,settling = <2>; > + ts,fraction-z = <7>; > + ts,i-drive = <1>; > + }; > + > + }; This is also missing a binding, but that's not your fault so I won't block this patch based on this. Could you make sure to ping the driver author about this or fix it in a follow on patch? > + > + accel: mma8452@1c { > + compatible = "fsl,mma8452"; > + reg = <0x1c>; > + }; > + > + rtc: pcf8523@68 { > + compatible = "nxp,pcf8523"; > + reg = <0x68>; > + }; > +}; > + > +&i2c2 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_i2c2_novena>; > + status = "okay"; > + > + pmic: pfuze100@08 { > + compatible = "fsl,pfuze100"; > + reg = <0x08>; > + > + regulators { > + sw1a_reg: sw1ab { > + regulator-min-microvolt = <300000>; > + regulator-max-microvolt = <1875000>; > + regulator-boot-on; > + regulator-always-on; > + regulator-ramp-delay = <6250>; > + }; > + > + sw1c_reg: sw1c { > + regulator-min-microvolt = <300000>; > + regulator-max-microvolt = <1875000>; > + regulator-boot-on; > + regulator-always-on; > + }; > + > + sw2_reg: sw2 { > + regulator-min-microvolt = <800000>; > + regulator-max-microvolt = <3300000>; > + regulator-boot-on; > + regulator-always-on; > + }; > + > + sw3a_reg: sw3a { > + regulator-min-microvolt = <400000>; > + regulator-max-microvolt = <1975000>; > + regulator-boot-on; > + regulator-always-on; > + }; > + > + sw3b_reg: sw3b { > + regulator-min-microvolt = <400000>; > + regulator-max-microvolt = <1975000>; > + regulator-boot-on; > + regulator-always-on; > + }; > + > + sw4_reg: sw4 { > + regulator-min-microvolt = <800000>; > + regulator-max-microvolt = <3300000>; > + }; > + > + swbst_reg: swbst { > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5150000>; > + regulator-boot-on; > + }; > + > + snvs_reg: vsnvs { > + regulator-min-microvolt = <1000000>; > + regulator-max-microvolt = <3000000>; > + regulator-boot-on; > + regulator-always-on; > + }; > + > + vref_reg: vrefddr { > + regulator-boot-on; > + regulator-always-on; > + }; > + > + vgen1_reg: vgen1 { > + regulator-min-microvolt = <800000>; > + regulator-max-microvolt = <1550000>; > + }; > + > + vgen2_reg: vgen2 { > + regulator-min-microvolt = <800000>; > + regulator-max-microvolt = <1550000>; > + }; > + > + vgen3_reg: vgen3 { > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <3300000>; > + }; > + > + vgen4_reg: vgen4 { > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + }; > + > + vgen5_reg: vgen5 { > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + }; > + > + vgen6_reg: vgen6 { > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + }; > + }; > + }; > +}; > + > +&i2c3 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_i2c3_novena>; > + status = "okay"; > + > + codec: es8328@11 { > + compatible = "everest,es8328"; > + reg = <0x11>; > + DVDD-supply = <®_audio_codec>; > + AVDD-supply = <®_audio_codec>; > + PVDD-supply = <®_audio_codec>; > + HPVDD-supply = <®_audio_codec>; > + > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_sound_novena>; > + > + clocks = <&clks IMX6QDL_CLK_CKO1>; > + assigned-clocks = <&clks IMX6QDL_CLK_CKO>, <&clks IMX6QDL_CLK_CKO1_SEL>, <&clks IMX6QDL_CLK_PLL4_AUDIO>, <&clks IMX6QDL_CLK_CKO1>; > + assigned-clock-parents = <&clks IMX6QDL_CLK_CKO1>, <&clks IMX6QDL_CLK_PLL4_AUDIO_DIV>, <&clks IMX6QDL_CLK_OSC>, <&clks IMX6QDL_CLK_CKO1_PODF>; > + assigned-clock-rates = <0 0 722534400 22579200>; > + }; > + > + eepromoops@56 { > + compatible = "kosagi,eepromoops"; Missing binding. > + reg = <0x56>; > + }; > + > + it6251@5c { > + compatible = "it,it6251"; Missing vendor prefix and binding. Also it seems there is no driver for this upstream, so unless you are completely sure about the binding it may be better to drop this node until there is a driver using it. > + reg = <0x5c>; > + power-supply = <®_display>; > + }; > +}; > + > +&iomuxc { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_hog>; > + > + audmux { > + pinctrl_audmux_novena: audmuxgrp-novena { > + fsl,pins = < > + MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x80000000 > + MX6QDL_PAD_CSI0_DAT4__AUD3_TXC 0x80000000 > + MX6QDL_PAD_CSI0_DAT5__AUD3_TXD 0x80000000 > + MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS 0x80000000 > + >; > + }; > + }; > + > + kpp-keys { > + pinctrl_kpp_novena: kppgrp-novena { > + fsl,pins = < > + /* Front panel button */ > + MX6QDL_PAD_KEY_ROW1__KEY_ROW1 0x1b0b1 > + > + /* Fake column driver, not connected to anything */ > + MX6QDL_PAD_KEY_COL1__KEY_COL1 0x1b0b1 > + >; > + }; > + }; > + > + backlight { > + pinctrl_backlight_novena: backlightgrp-novena { > + fsl,pins = < > + MX6QDL_PAD_DISP0_DAT8__PWM1_OUT 0x1b0b0 > + MX6QDL_PAD_CSI0_DAT10__GPIO5_IO28 0x80000000 > + MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x80000000 > + >; > + }; > + }; > + > + ecspi3 { > + pinctrl_ecspi3_novena: ecspi3grp-novena { > + fsl,pins = < > + MX6QDL_PAD_DISP0_DAT2__ECSPI3_MISO 0x100b1 > + MX6QDL_PAD_DISP0_DAT1__ECSPI3_MOSI 0x100b1 > + MX6QDL_PAD_DISP0_DAT0__ECSPI3_SCLK 0x100b1 > + >; > + }; > + }; > + > + enet { > + pinctrl_enet_novena: enetgrp-novena { > + fsl,pins = < > + MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0 > + MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0 > + MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b020 > + MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b028 > + MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b028 > + MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b028 > + MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b028 > + MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b028 > + MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0 > + MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0 > + MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0 > + MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0 > + MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0 > + MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0 > + MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0 > + MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8 > + > + /* Ethernet reset */ > + MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x80000000 > + >; > + }; > + }; > + > + gpio_keys { > + pinctrl_gpio_keys_novena: gpiokeysgrp-novena { > + fsl,pins = < > + /* User button */ > + MX6QDL_PAD_KEY_COL4__GPIO4_IO14 0x1b0b0 > + > + /* PCIe Wakeup */ > + MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1f0e0 > + > + /* Lid switch */ > + MX6QDL_PAD_KEY_COL3__GPIO4_IO12 0x1b0b0 > + >; > + }; > + }; > + > + hdmi { > + pinctrl_hdmi_novena: hdmigrp-novena { > + fsl,pins = < > + MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0 > + MX6QDL_PAD_EIM_A24__GPIO5_IO04 0x80000000 > + >; > + }; > + }; > + > + i2c1 { > + pinctrl_i2c1_novena: i2c1grp-novena { > + fsl,pins = < > + MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1 > + MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1 > + >; > + }; > + }; > + > + i2c2 { > + pinctrl_i2c2_novena: i2c2grp-novena { > + fsl,pins = < > + MX6QDL_PAD_EIM_EB2__I2C2_SCL 0x4001b8b1 > + MX6QDL_PAD_EIM_D16__I2C2_SDA 0x4001b8b1 > + >; > + }; > + }; > + > + i2c3 { > + pinctrl_i2c3_novena: i2c3grp-novena { > + fsl,pins = < > + MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1 > + MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1 > + >; > + }; > + }; > + > + leds { > + pinctrl_leds_novena: ledsgrp-novena { > + fsl,pins = < > + MX6QDL_PAD_SD1_DAT3__GPIO1_IO21 0x80000000 > + >; > + }; > + }; > + > + fpga { > + pinctrl_fpga_gpio: fpgagpiogrp-novena { > + fsl,pins = < > + /* FPGA power */ > + MX6QDL_PAD_SD1_DAT1__GPIO1_IO17 0x80000000 > + > + /* Reset */ > + MX6QDL_PAD_DISP0_DAT13__GPIO5_IO07 0x80000000 > + > + /* FPGA GPIOs */ > + MX6QDL_PAD_EIM_DA0__GPIO3_IO00 0x80000000 > + MX6QDL_PAD_EIM_DA1__GPIO3_IO01 0x80000000 > + MX6QDL_PAD_EIM_DA2__GPIO3_IO02 0x80000000 > + MX6QDL_PAD_EIM_DA3__GPIO3_IO03 0x80000000 > + MX6QDL_PAD_EIM_DA4__GPIO3_IO04 0x80000000 > + MX6QDL_PAD_EIM_DA5__GPIO3_IO05 0x80000000 > + MX6QDL_PAD_EIM_DA6__GPIO3_IO06 0x80000000 > + MX6QDL_PAD_EIM_DA7__GPIO3_IO07 0x80000000 > + MX6QDL_PAD_EIM_DA8__GPIO3_IO08 0x80000000 > + MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x80000000 > + MX6QDL_PAD_EIM_DA10__GPIO3_IO10 0x80000000 > + MX6QDL_PAD_EIM_DA11__GPIO3_IO11 0x80000000 > + MX6QDL_PAD_EIM_DA12__GPIO3_IO12 0x80000000 > + MX6QDL_PAD_EIM_DA13__GPIO3_IO13 0x80000000 > + MX6QDL_PAD_EIM_DA14__GPIO3_IO14 0x80000000 > + MX6QDL_PAD_EIM_DA15__GPIO3_IO15 0x80000000 > + MX6QDL_PAD_EIM_A16__GPIO2_IO22 0x80000000 > + MX6QDL_PAD_EIM_A17__GPIO2_IO21 0x80000000 > + MX6QDL_PAD_EIM_A18__GPIO2_IO20 0x80000000 > + MX6QDL_PAD_EIM_CS0__GPIO2_IO23 0x80000000 > + MX6QDL_PAD_EIM_CS1__GPIO2_IO24 0x80000000 > + MX6QDL_PAD_EIM_LBA__GPIO2_IO27 0x80000000 > + MX6QDL_PAD_EIM_OE__GPIO2_IO25 0x80000000 > + MX6QDL_PAD_EIM_RW__GPIO2_IO26 0x80000000 > + MX6QDL_PAD_EIM_WAIT__GPIO5_IO00 0x80000000 > + MX6QDL_PAD_EIM_BCLK__GPIO6_IO31 0x80000000 > + >; > + }; > + > + pinctrl_fpga_eim: fpgaeimgrp-novena { > + fsl,pins = < > + /* FPGA power */ > + MX6QDL_PAD_SD1_DAT1__GPIO1_IO17 0x80000000 > + > + /* Reset */ > + MX6QDL_PAD_DISP0_DAT13__GPIO5_IO07 0x80000000 > + > + /* FPGA GPIOs */ > + MX6QDL_PAD_EIM_DA0__EIM_AD00 0xb0f1 > + MX6QDL_PAD_EIM_DA1__EIM_AD01 0xb0f1 > + MX6QDL_PAD_EIM_DA2__EIM_AD02 0xb0f1 > + MX6QDL_PAD_EIM_DA3__EIM_AD03 0xb0f1 > + MX6QDL_PAD_EIM_DA4__EIM_AD04 0xb0f1 > + MX6QDL_PAD_EIM_DA5__EIM_AD05 0xb0f1 > + MX6QDL_PAD_EIM_DA6__EIM_AD06 0xb0f1 > + MX6QDL_PAD_EIM_DA7__EIM_AD07 0xb0f1 > + MX6QDL_PAD_EIM_DA8__EIM_AD08 0xb0f1 > + MX6QDL_PAD_EIM_DA9__EIM_AD09 0xb0f1 > + MX6QDL_PAD_EIM_DA10__EIM_AD10 0xb0f1 > + MX6QDL_PAD_EIM_DA11__EIM_AD11 0xb0f1 > + MX6QDL_PAD_EIM_DA12__EIM_AD12 0xb0f1 > + MX6QDL_PAD_EIM_DA13__EIM_AD13 0xb0f1 > + MX6QDL_PAD_EIM_DA14__EIM_AD14 0xb0f1 > + MX6QDL_PAD_EIM_DA15__EIM_AD15 0xb0f1 > + MX6QDL_PAD_EIM_A16__EIM_ADDR16 0xb0f1 > + MX6QDL_PAD_EIM_A17__EIM_ADDR17 0xb0f1 > + MX6QDL_PAD_EIM_A18__EIM_ADDR18 0xb0f1 > + MX6QDL_PAD_EIM_CS0__EIM_CS0_B 0xb0f1 > + MX6QDL_PAD_EIM_CS1__EIM_CS1_B 0xb0f1 > + MX6QDL_PAD_EIM_LBA__EIM_LBA_B 0xb0f1 > + MX6QDL_PAD_EIM_OE__EIM_OE_B 0xb0f1 > + MX6QDL_PAD_EIM_RW__EIM_RW 0xb0f1 > + MX6QDL_PAD_EIM_WAIT__EIM_WAIT_B 0xb0f1 > + MX6QDL_PAD_EIM_BCLK__EIM_BCLK 0xb0f1 > + >; > + }; > + }; > + > + hog { > + pinctrl_hog: hoggrp-novena { > + fsl,pins = < > + /* Peek array power */ > + MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000 > + >; > + }; > + }; What is this used for? If possible please avoid using any hogs. > + > + pcie { > + pinctrl_pcie_novena: pciegrp-novena { > + fsl,pins = < > + /* Reset */ > + MX6QDL_PAD_EIM_D29__GPIO3_IO29 0x80000000 > + > + /* Power On */ > + MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000 > + > + /* Wifi kill */ > + MX6QDL_PAD_EIM_A22__GPIO2_IO16 0x80000000 > + >; > + }; > + }; > + > + sata { > + pinctrl_sata_novena: satagrp-novena { > + fsl,pins = < > + MX6QDL_PAD_EIM_D30__GPIO3_IO30 0x80000000 > + >; > + }; > + }; > + > + senoko { > + pinctrl_senoko_novena: senokogrp-novena { > + fsl,pins = < > + /* Senoko IRQ line */ > + MX6QDL_PAD_SD1_CLK__GPIO1_IO20 0x13048 > + > + /* Senoko reset line */ > + MX6QDL_PAD_CSI0_VSYNC__GPIO5_IO21 0x80000000 > + >; > + }; > + }; > + > + sound { > + pinctrl_sound_novena: soundgrp-novena { > + fsl,pins = < > + /* Audio power regulator */ > + MX6QDL_PAD_DISP0_DAT23__GPIO5_IO17 0x80000000 > + > + /* Headphone plug */ > + MX6QDL_PAD_DISP0_DAT21__GPIO5_IO15 0x80000000 > + > + MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x80000000 > + >; > + }; > + }; > + > + ts { > + pinctrl_stmpe_novena: stmpegrp-novena { > + fsl,pins = < > + /* Touchscreen interrupt */ > + MX6QDL_PAD_DISP0_DAT19__GPIO5_IO13 0x80000000 > + >; > + }; > + }; > + > + uart2 { > + pinctrl_uart2_novena: uart2grp-novena { > + fsl,pins = < > + MX6QDL_PAD_EIM_D26__UART2_TX_DATA 0x1b0b1 > + MX6QDL_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1 > + >; > + }; > + }; > + > + uart3 { > + pinctrl_uart3_novena: uart3grp-novena { > + fsl,pins = < > + MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1 > + MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1 > + >; > + }; > + }; > + uart4 { > + pinctrl_uart4_novena: uart4grp-novena { > + fsl,pins = < > + MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA 0x1b0b1 > + MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1 > + >; > + }; > + }; > + > + usbotg { > + pinctrl_usbotg_novena: usbotggrp-novena { > + fsl,pins = < > + MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059 > + >; > + }; > + }; > + > + usdhc2 { > + pinctrl_usdhc2_novena: usdhc2grp-novena { > + 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 0x17059 > + > + /* Write protect */ > + MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000 > + > + /* Card detect */ > + MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x80000000 > + >; > + }; > + }; > + > + usdhc3 { > + pinctrl_usdhc3_novena: usdhc3grp-novena { > + 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 > + >; > + }; > + }; > +}; > + > +&kpp { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_kpp_novena>; > + linux,keymap = < > + MATRIX_KEY(1, 1, KEY_CONFIG) > + >; > + wakeup; This probably needs a prefix. > + status = "okay"; > +}; > + > +&ldb { > + fsl,dual-channel; > + status = "okay"; > + lvds-channel@0 { > + fsl,data-mapping = "jeida"; > + fsl,data-width = <24>; > + fsl,panel = <&panel>; > + status = "okay"; > + }; > +}; > + > +&pcie { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_pcie_novena>; > + reset-gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>; > + bus-supply = <®_pcie>; > + status = "okay"; > +}; > + > +&sata { > + target-supply = <®_sata>; > + fsl,transmit-level-mV = <1025>; > + fsl,transmit-boost-mdB = <0>; > + fsl,transmit-atten-16ths = <8>; > + status = "okay"; > +}; > + > +&ssi1 { > + fsl,mode = "i2s-slave"; > + status = "okay"; > +}; > + > +&uart2 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart2_novena>; > + status = "okay"; > +}; > + > +&uart3 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart3_novena>; > + status = "okay"; > +}; > + > +&uart4 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart4_novena>; > + status = "okay"; > +}; > + > +&usbotg { > + vbus-supply = <®_usb_otg_vbus>; > + dr_mode = "otg"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_usbotg_novena>; > + disable-over-current; > + status = "okay"; > +}; > + > +&usbh1 { > + vbus-supply = <&swbst_reg>; > + status = "okay"; > +}; > + > +&usdhc2 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_usdhc2_1>; > + pinctrl-0 = <&pinctrl_usdhc2_novena>; > + cd-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; > + wp-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; > + status = "okay"; > +}; > + > +&usdhc3 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_usdhc3_novena>; > + non-removable; > + status = "okay"; > +}; ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 4/4] ARM: dts: imx6q: add Novena board 2015-01-19 10:04 ` Lucas Stach @ 2015-01-30 6:48 ` Sean Cross 0 siblings, 0 replies; 13+ messages in thread From: Sean Cross @ 2015-01-30 6:48 UTC (permalink / raw) To: Lucas Stach Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Shawn Guo, Bjorn Helgaas, devicetree, Richard Zhu, Grant Likely, linux-pci, bunnie On 19/01/2015 18:04, Lucas Stach wrote: > Am Montag, den 22.12.2014, 16:32 +0800 schrieb Sean Cross: >> Novena is an open-hardware laptop/desktop/bare board. >> >> See http://www.kosagi.com/w/index.php?title=Novena_Main_Page >> >> This device tree contains additional nodes for FPGA support. >> >> Signed-off-by: Sean Cross <xobs@kosagi.com> > Some remarks inline. Otherwise looks good to me. Responses inline. I can address these issues and submit a v3, minus the PCIe power switch patch (but with the bus-supply line in the device tree file.) > > Regards, > Lucas > >> --- >> arch/arm/boot/dts/Makefile | 1 + >> arch/arm/boot/dts/imx6q-novena.dts | 856 +++++++++++++++++++++++++++++++++++++ >> 2 files changed, 857 insertions(+) >> create mode 100644 arch/arm/boot/dts/imx6q-novena.dts >> >> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile >> index 38c89ca..b2b4770 100644 >> --- a/arch/arm/boot/dts/Makefile >> +++ b/arch/arm/boot/dts/Makefile >> @@ -234,6 +234,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ >> imx6q-gw552x.dtb \ >> imx6q-hummingboard.dtb \ >> imx6q-nitrogen6x.dtb \ >> + imx6q-novena.dtb \ >> imx6q-phytec-pbab01.dtb \ >> imx6q-rex-pro.dtb \ >> imx6q-sabreauto.dtb \ >> diff --git a/arch/arm/boot/dts/imx6q-novena.dts b/arch/arm/boot/dts/imx6q-novena.dts >> new file mode 100644 >> index 0000000..d4a3a06 >> --- /dev/null >> +++ b/arch/arm/boot/dts/imx6q-novena.dts >> @@ -0,0 +1,856 @@ >> +/* >> + * Copyright 2014 Sutajio Ko-Usagi PTE LTD >> + * Copyright 2012 Freescale Semiconductor, Inc. >> + * Copyright 2011 Linaro Ltd. >> + * >> + * The code contained herein is licensed under the GNU General Public >> + * License. You may obtain a copy of the GNU General Public License >> + * Version 2 or later at the following locations: >> + * >> + * http://www.opensource.org/licenses/gpl-license.html >> + * http://www.gnu.org/copyleft/gpl.html >> + */ >> + >> +/dts-v1/; >> +#include "imx6q.dtsi" >> +#include <dt-bindings/gpio/gpio.h> >> +#include <dt-bindings/input/input.h> >> + >> +/ { >> + model = "Kosagi Novena Dual/Quad"; >> + compatible = "kosagi,imx6q-novena", "fsl,imx6q"; >> + >> + memory { >> + reg = <0x10000000 0xefffffff>; >> + }; >> + >> + chosen { >> + stdout-path = &uart2; >> + }; >> + >> + regulators { >> + compatible = "simple-bus"; >> + > I know it is common practice in many DTs, but this "bus" is completely > unnecessary and we should stop using this pattern for new DTs. Please > move those regulators directly into the parent node. Will do. > >> + reg_2p5v: 2p5v { >> + compatible = "regulator-fixed"; >> + regulator-name = "2P5V"; >> + regulator-min-microvolt = <2500000>; >> + regulator-max-microvolt = <2500000>; >> + regulator-always-on; >> + }; >> + >> + reg_3p3v: 3p3v { >> + compatible = "regulator-fixed"; >> + regulator-name = "3P3V"; >> + regulator-min-microvolt = <3300000>; >> + regulator-max-microvolt = <3300000>; >> + regulator-always-on; >> + }; >> + >> + reg_usb_otg_vbus: usb_otg_vbus { >> + compatible = "regulator-fixed"; >> + regulator-name = "usb_otg_vbus"; >> + regulator-min-microvolt = <5000000>; >> + regulator-max-microvolt = <5000000>; >> + enable-active-high; >> + }; >> + >> + reg_audio_codec: es8328-regulator { >> + compatible = "regulator-fixed"; >> + regulator-name = "es8328-power"; >> + regulator-boot-on; >> + regulator-min-microvolt = <5000000>; >> + regulator-max-microvolt = <5000000>; >> + startup-delay-us = <400000>; >> + gpio = <&gpio5 17 GPIO_ACTIVE_HIGH>; >> + enable-active-high; >> + }; >> + >> + reg_pcie: pcie-regulator { >> + compatible = "regulator-fixed"; >> + regulator-name = "pcie-bus-power"; >> + regulator-min-microvolt = <1500000>; >> + regulator-max-microvolt = <1500000>; >> + gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>; >> + enable-active-high; >> + }; >> + >> + reg_lvds_lcd: lcd-regulator { >> + compatible = "regulator-fixed"; >> + regulator-name = "lcd-lvds-power"; >> + regulator-min-microvolt = <3300000>; >> + regulator-max-microvolt = <3300000>; >> + gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>; >> + enable-active-high; >> + }; >> + >> + reg_display: display-regulator { >> + compatible = "regulator-fixed"; >> + regulator-name = "lcd-display-power"; >> + regulator-min-microvolt = <3300000>; >> + regulator-max-microvolt = <3300000>; >> + startup-delay-us = <200000>; >> + gpio = <&gpio5 28 GPIO_ACTIVE_HIGH>; >> + enable-active-high; >> + }; >> + >> + reg_sata: sata-regulator { >> + compatible = "regulator-fixed"; >> + regulator-name = "sata-power"; >> + regulator-boot-on; >> + regulator-min-microvolt = <3300000>; >> + regulator-max-microvolt = <3300000>; >> + startup-delay-us = <10000>; >> + gpio = <&gpio3 30 GPIO_ACTIVE_HIGH>; >> + enable-active-high; >> + }; >> + }; >> + >> + gpio-keys { >> + compatible = "gpio-keys"; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_gpio_keys_novena>; >> + >> + user-button { >> + label = "User Button"; >> + gpios = <&gpio4 14 GPIO_ACTIVE_LOW>; >> + linux,code = <KEY_POWER>; >> + }; >> + >> + lid { >> + label = "Lid"; >> + gpios = <&gpio4 12 GPIO_ACTIVE_LOW>; >> + linux,input-type = <5>; /* EV_SW */ >> + linux,code = <0>; /* SW_LID */ >> + }; >> + }; >> + >> + leds { >> + compatible = "gpio-leds"; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_leds_novena>; >> + >> + heartbeat { >> + label = "novena:white:panel"; >> + gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>; >> + linux,default-trigger = "default-on"; >> + }; >> + }; >> + >> + backlight: backlight { >> + compatible = "pwm-backlight"; >> + pwms = <&pwm1 0 10000000>; >> + >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_backlight_novena>; >> + power-supply = <®_lvds_lcd>; >> + >> + brightness-levels = <0 3 6 12 16 24 32 48 64 96 128 192 255>; >> + default-brightness-level = <12>; >> + }; >> + >> + panel: panel { >> + compatible = "innolux,n133hse-ea1", "simple-panel"; >> + backlight = <&backlight>; >> + }; >> + >> + sound { >> + compatible = "fsl,imx-audio-es8328"; >> + model = "imx-audio-es8328"; >> + ssi-controller = <&ssi1>; >> + audio-codec = <&codec>; >> + audio-amp-supply = <®_audio_codec>; >> + jack-gpio = <&gpio5 15 GPIO_ACTIVE_HIGH>; >> + audio-routing = >> + "Speaker", "LOUT2", >> + "Speaker", "ROUT2", >> + "Speaker", "audio-amp", >> + "Headphone", "ROUT1", >> + "Headphone", "LOUT1", >> + "LINPUT1", "Mic Jack", >> + "RINPUT1", "Mic Jack", >> + "Mic Jack", "Mic Bias"; >> + mux-int-port = <0x1>; >> + mux-ext-port = <0x3>; >> + }; >> +}; >> + >> +&audmux { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_audmux_novena>; >> + status = "okay"; >> +}; >> + >> +&fec { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_enet_novena>; >> + phy-mode = "rgmii"; >> + phy-reset-gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>; >> + mac-address = [00 00 00 00 00 00]; >> + rxc-skew-ps = <3000>; >> + rxdv-skew-ps = <0>; >> + txc-skew-ps = <3000>; >> + txen-skew-ps = <0>; >> + rxd0-skew-ps = <0>; >> + rxd1-skew-ps = <0>; >> + rxd2-skew-ps = <0>; >> + rxd3-skew-ps = <0>; >> + txd0-skew-ps = <3000>; >> + txd1-skew-ps = <3000>; >> + txd2-skew-ps = <3000>; >> + txd3-skew-ps = <3000>; >> + status = "okay"; >> +}; >> + >> +&ecspi3 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_ecspi3_novena>; >> + fsl,spi-num-chipselects = <3>; >> + status = "okay"; >> + >> + spidev@0 { >> + compatible = "spidev"; >> + spi-max-frequency = <30000000>; >> + reg = <0>; >> + }; >> +}; >> + >> +&hdmi { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_hdmi_novena>; >> + ddc-i2c-bus = <&i2c2>; >> + status = "okay"; >> +}; >> + >> +&i2c1 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_i2c1_novena>; >> + status = "okay"; >> + >> + sbs_battery: bq20z75@0b { >> + compatible = "sbs,sbs-battery"; >> + reg = <0x0b>; >> + sbs,i2c-retry-count = <50>; >> + }; >> + >> + senoko: senoko@20 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_senoko_novena>; >> + compatible = "kosagi,senoko"; > This is missing a binding documentation. This is the power supply board. I have an set of MFD/input/regulator/RTC devices that I will push at a later time. Would the correct approach be to remove this node for now, and add it back in when that driver is pushed? >> + reg = <0x20>; >> + irq-gpio = <&gpio1 20 GPIO_ACTIVE_HIGH>; >> + supplied-to = "sbs-0-000b"; >> + }; >> + >> + stmpe811@44 { >> + compatible = "st,stmpe811"; >> + #address-cells = <1>; >> + #size-cells = <0>; >> + reg = <0x44>; >> + irq-gpio = <&gpio5 13 GPIO_ACTIVE_HIGH>; >> + id = <0>; >> + blocks = <0x5>; >> + irq-trigger = <0x1>; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_stmpe_novena>; >> + vio-supply = <®_3p3v>; >> + vcc-supply = <®_3p3v>; >> + >> + stmpe_touchscreen { >> + compatible = "st,stmpe-ts"; >> + ts,sample-time = <4>; >> + ts,mod-12b = <1>; >> + ts,ref-sel = <0>; >> + ts,adc-freq = <1>; >> + ts,ave-ctrl = <1>; >> + ts,touch-det-delay = <2>; >> + ts,settling = <2>; >> + ts,fraction-z = <7>; >> + ts,i-drive = <1>; >> + }; >> + >> + }; > This is also missing a binding, but that's not your fault so I won't > block this patch based on this. Could you make sure to ping the driver > author about this or fix it in a follow on patch? Sure, or I'm happy to add binding documentation as a separate patch. It's annoyed me long enough to have to look into the source to find values. >> + >> + accel: mma8452@1c { >> + compatible = "fsl,mma8452"; >> + reg = <0x1c>; >> + }; >> + >> + rtc: pcf8523@68 { >> + compatible = "nxp,pcf8523"; >> + reg = <0x68>; >> + }; >> +}; >> + >> +&i2c2 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_i2c2_novena>; >> + status = "okay"; >> + >> + pmic: pfuze100@08 { >> + compatible = "fsl,pfuze100"; >> + reg = <0x08>; >> + >> + regulators { >> + sw1a_reg: sw1ab { >> + regulator-min-microvolt = <300000>; >> + regulator-max-microvolt = <1875000>; >> + regulator-boot-on; >> + regulator-always-on; >> + regulator-ramp-delay = <6250>; >> + }; >> + >> + sw1c_reg: sw1c { >> + regulator-min-microvolt = <300000>; >> + regulator-max-microvolt = <1875000>; >> + regulator-boot-on; >> + regulator-always-on; >> + }; >> + >> + sw2_reg: sw2 { >> + regulator-min-microvolt = <800000>; >> + regulator-max-microvolt = <3300000>; >> + regulator-boot-on; >> + regulator-always-on; >> + }; >> + >> + sw3a_reg: sw3a { >> + regulator-min-microvolt = <400000>; >> + regulator-max-microvolt = <1975000>; >> + regulator-boot-on; >> + regulator-always-on; >> + }; >> + >> + sw3b_reg: sw3b { >> + regulator-min-microvolt = <400000>; >> + regulator-max-microvolt = <1975000>; >> + regulator-boot-on; >> + regulator-always-on; >> + }; >> + >> + sw4_reg: sw4 { >> + regulator-min-microvolt = <800000>; >> + regulator-max-microvolt = <3300000>; >> + }; >> + >> + swbst_reg: swbst { >> + regulator-min-microvolt = <5000000>; >> + regulator-max-microvolt = <5150000>; >> + regulator-boot-on; >> + }; >> + >> + snvs_reg: vsnvs { >> + regulator-min-microvolt = <1000000>; >> + regulator-max-microvolt = <3000000>; >> + regulator-boot-on; >> + regulator-always-on; >> + }; >> + >> + vref_reg: vrefddr { >> + regulator-boot-on; >> + regulator-always-on; >> + }; >> + >> + vgen1_reg: vgen1 { >> + regulator-min-microvolt = <800000>; >> + regulator-max-microvolt = <1550000>; >> + }; >> + >> + vgen2_reg: vgen2 { >> + regulator-min-microvolt = <800000>; >> + regulator-max-microvolt = <1550000>; >> + }; >> + >> + vgen3_reg: vgen3 { >> + regulator-min-microvolt = <1800000>; >> + regulator-max-microvolt = <3300000>; >> + }; >> + >> + vgen4_reg: vgen4 { >> + regulator-min-microvolt = <1800000>; >> + regulator-max-microvolt = <3300000>; >> + regulator-always-on; >> + }; >> + >> + vgen5_reg: vgen5 { >> + regulator-min-microvolt = <1800000>; >> + regulator-max-microvolt = <3300000>; >> + regulator-always-on; >> + }; >> + >> + vgen6_reg: vgen6 { >> + regulator-min-microvolt = <1800000>; >> + regulator-max-microvolt = <3300000>; >> + regulator-always-on; >> + }; >> + }; >> + }; >> +}; >> + >> +&i2c3 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_i2c3_novena>; >> + status = "okay"; >> + >> + codec: es8328@11 { >> + compatible = "everest,es8328"; >> + reg = <0x11>; >> + DVDD-supply = <®_audio_codec>; >> + AVDD-supply = <®_audio_codec>; >> + PVDD-supply = <®_audio_codec>; >> + HPVDD-supply = <®_audio_codec>; >> + >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_sound_novena>; >> + >> + clocks = <&clks IMX6QDL_CLK_CKO1>; >> + assigned-clocks = <&clks IMX6QDL_CLK_CKO>, <&clks IMX6QDL_CLK_CKO1_SEL>, <&clks IMX6QDL_CLK_PLL4_AUDIO>, <&clks IMX6QDL_CLK_CKO1>; >> + assigned-clock-parents = <&clks IMX6QDL_CLK_CKO1>, <&clks IMX6QDL_CLK_PLL4_AUDIO_DIV>, <&clks IMX6QDL_CLK_OSC>, <&clks IMX6QDL_CLK_CKO1_PODF>; >> + assigned-clock-rates = <0 0 722534400 22579200>; >> + }; >> + >> + eepromoops@56 { >> + compatible = "kosagi,eepromoops"; > Missing binding. Again, I'll remove this node until the device is pushed. >> + reg = <0x56>; >> + }; >> + >> + it6251@5c { >> + compatible = "it,it6251"; > Missing vendor prefix and binding. Also it seems there is no driver for > this upstream, so unless you are completely sure about the binding it > may be better to drop this node until there is a driver using it. You're right, this will require more work and may gain a more complex binding as features are added (e.g. interactions with DRM, as it's an LVDS -> eDP chip which has to interact with &ldb.) Again, I'll drop this until the driver is pushed. >> + reg = <0x5c>; >> + power-supply = <®_display>; >> + }; >> +}; >> + >> +&iomuxc { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_hog>; >> + >> + audmux { >> + pinctrl_audmux_novena: audmuxgrp-novena { >> + fsl,pins = < >> + MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x80000000 >> + MX6QDL_PAD_CSI0_DAT4__AUD3_TXC 0x80000000 >> + MX6QDL_PAD_CSI0_DAT5__AUD3_TXD 0x80000000 >> + MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS 0x80000000 >> + >; >> + }; >> + }; >> + >> + kpp-keys { >> + pinctrl_kpp_novena: kppgrp-novena { >> + fsl,pins = < >> + /* Front panel button */ >> + MX6QDL_PAD_KEY_ROW1__KEY_ROW1 0x1b0b1 >> + >> + /* Fake column driver, not connected to anything */ >> + MX6QDL_PAD_KEY_COL1__KEY_COL1 0x1b0b1 >> + >; >> + }; >> + }; >> + >> + backlight { >> + pinctrl_backlight_novena: backlightgrp-novena { >> + fsl,pins = < >> + MX6QDL_PAD_DISP0_DAT8__PWM1_OUT 0x1b0b0 >> + MX6QDL_PAD_CSI0_DAT10__GPIO5_IO28 0x80000000 >> + MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x80000000 >> + >; >> + }; >> + }; >> + >> + ecspi3 { >> + pinctrl_ecspi3_novena: ecspi3grp-novena { >> + fsl,pins = < >> + MX6QDL_PAD_DISP0_DAT2__ECSPI3_MISO 0x100b1 >> + MX6QDL_PAD_DISP0_DAT1__ECSPI3_MOSI 0x100b1 >> + MX6QDL_PAD_DISP0_DAT0__ECSPI3_SCLK 0x100b1 >> + >; >> + }; >> + }; >> + >> + enet { >> + pinctrl_enet_novena: enetgrp-novena { >> + fsl,pins = < >> + MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0 >> + MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0 >> + MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b020 >> + MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b028 >> + MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b028 >> + MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b028 >> + MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b028 >> + MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b028 >> + MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0 >> + MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0 >> + MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0 >> + MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0 >> + MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0 >> + MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0 >> + MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0 >> + MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8 >> + >> + /* Ethernet reset */ >> + MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x80000000 >> + >; >> + }; >> + }; >> + >> + gpio_keys { >> + pinctrl_gpio_keys_novena: gpiokeysgrp-novena { >> + fsl,pins = < >> + /* User button */ >> + MX6QDL_PAD_KEY_COL4__GPIO4_IO14 0x1b0b0 >> + >> + /* PCIe Wakeup */ >> + MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1f0e0 >> + >> + /* Lid switch */ >> + MX6QDL_PAD_KEY_COL3__GPIO4_IO12 0x1b0b0 >> + >; >> + }; >> + }; >> + >> + hdmi { >> + pinctrl_hdmi_novena: hdmigrp-novena { >> + fsl,pins = < >> + MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0 >> + MX6QDL_PAD_EIM_A24__GPIO5_IO04 0x80000000 >> + >; >> + }; >> + }; >> + >> + i2c1 { >> + pinctrl_i2c1_novena: i2c1grp-novena { >> + fsl,pins = < >> + MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1 >> + MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1 >> + >; >> + }; >> + }; >> + >> + i2c2 { >> + pinctrl_i2c2_novena: i2c2grp-novena { >> + fsl,pins = < >> + MX6QDL_PAD_EIM_EB2__I2C2_SCL 0x4001b8b1 >> + MX6QDL_PAD_EIM_D16__I2C2_SDA 0x4001b8b1 >> + >; >> + }; >> + }; >> + >> + i2c3 { >> + pinctrl_i2c3_novena: i2c3grp-novena { >> + fsl,pins = < >> + MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1 >> + MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1 >> + >; >> + }; >> + }; >> + >> + leds { >> + pinctrl_leds_novena: ledsgrp-novena { >> + fsl,pins = < >> + MX6QDL_PAD_SD1_DAT3__GPIO1_IO21 0x80000000 >> + >; >> + }; >> + }; >> + >> + fpga { >> + pinctrl_fpga_gpio: fpgagpiogrp-novena { >> + fsl,pins = < >> + /* FPGA power */ >> + MX6QDL_PAD_SD1_DAT1__GPIO1_IO17 0x80000000 >> + >> + /* Reset */ >> + MX6QDL_PAD_DISP0_DAT13__GPIO5_IO07 0x80000000 >> + >> + /* FPGA GPIOs */ >> + MX6QDL_PAD_EIM_DA0__GPIO3_IO00 0x80000000 >> + MX6QDL_PAD_EIM_DA1__GPIO3_IO01 0x80000000 >> + MX6QDL_PAD_EIM_DA2__GPIO3_IO02 0x80000000 >> + MX6QDL_PAD_EIM_DA3__GPIO3_IO03 0x80000000 >> + MX6QDL_PAD_EIM_DA4__GPIO3_IO04 0x80000000 >> + MX6QDL_PAD_EIM_DA5__GPIO3_IO05 0x80000000 >> + MX6QDL_PAD_EIM_DA6__GPIO3_IO06 0x80000000 >> + MX6QDL_PAD_EIM_DA7__GPIO3_IO07 0x80000000 >> + MX6QDL_PAD_EIM_DA8__GPIO3_IO08 0x80000000 >> + MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x80000000 >> + MX6QDL_PAD_EIM_DA10__GPIO3_IO10 0x80000000 >> + MX6QDL_PAD_EIM_DA11__GPIO3_IO11 0x80000000 >> + MX6QDL_PAD_EIM_DA12__GPIO3_IO12 0x80000000 >> + MX6QDL_PAD_EIM_DA13__GPIO3_IO13 0x80000000 >> + MX6QDL_PAD_EIM_DA14__GPIO3_IO14 0x80000000 >> + MX6QDL_PAD_EIM_DA15__GPIO3_IO15 0x80000000 >> + MX6QDL_PAD_EIM_A16__GPIO2_IO22 0x80000000 >> + MX6QDL_PAD_EIM_A17__GPIO2_IO21 0x80000000 >> + MX6QDL_PAD_EIM_A18__GPIO2_IO20 0x80000000 >> + MX6QDL_PAD_EIM_CS0__GPIO2_IO23 0x80000000 >> + MX6QDL_PAD_EIM_CS1__GPIO2_IO24 0x80000000 >> + MX6QDL_PAD_EIM_LBA__GPIO2_IO27 0x80000000 >> + MX6QDL_PAD_EIM_OE__GPIO2_IO25 0x80000000 >> + MX6QDL_PAD_EIM_RW__GPIO2_IO26 0x80000000 >> + MX6QDL_PAD_EIM_WAIT__GPIO5_IO00 0x80000000 >> + MX6QDL_PAD_EIM_BCLK__GPIO6_IO31 0x80000000 >> + >; >> + }; >> + >> + pinctrl_fpga_eim: fpgaeimgrp-novena { >> + fsl,pins = < >> + /* FPGA power */ >> + MX6QDL_PAD_SD1_DAT1__GPIO1_IO17 0x80000000 >> + >> + /* Reset */ >> + MX6QDL_PAD_DISP0_DAT13__GPIO5_IO07 0x80000000 >> + >> + /* FPGA GPIOs */ >> + MX6QDL_PAD_EIM_DA0__EIM_AD00 0xb0f1 >> + MX6QDL_PAD_EIM_DA1__EIM_AD01 0xb0f1 >> + MX6QDL_PAD_EIM_DA2__EIM_AD02 0xb0f1 >> + MX6QDL_PAD_EIM_DA3__EIM_AD03 0xb0f1 >> + MX6QDL_PAD_EIM_DA4__EIM_AD04 0xb0f1 >> + MX6QDL_PAD_EIM_DA5__EIM_AD05 0xb0f1 >> + MX6QDL_PAD_EIM_DA6__EIM_AD06 0xb0f1 >> + MX6QDL_PAD_EIM_DA7__EIM_AD07 0xb0f1 >> + MX6QDL_PAD_EIM_DA8__EIM_AD08 0xb0f1 >> + MX6QDL_PAD_EIM_DA9__EIM_AD09 0xb0f1 >> + MX6QDL_PAD_EIM_DA10__EIM_AD10 0xb0f1 >> + MX6QDL_PAD_EIM_DA11__EIM_AD11 0xb0f1 >> + MX6QDL_PAD_EIM_DA12__EIM_AD12 0xb0f1 >> + MX6QDL_PAD_EIM_DA13__EIM_AD13 0xb0f1 >> + MX6QDL_PAD_EIM_DA14__EIM_AD14 0xb0f1 >> + MX6QDL_PAD_EIM_DA15__EIM_AD15 0xb0f1 >> + MX6QDL_PAD_EIM_A16__EIM_ADDR16 0xb0f1 >> + MX6QDL_PAD_EIM_A17__EIM_ADDR17 0xb0f1 >> + MX6QDL_PAD_EIM_A18__EIM_ADDR18 0xb0f1 >> + MX6QDL_PAD_EIM_CS0__EIM_CS0_B 0xb0f1 >> + MX6QDL_PAD_EIM_CS1__EIM_CS1_B 0xb0f1 >> + MX6QDL_PAD_EIM_LBA__EIM_LBA_B 0xb0f1 >> + MX6QDL_PAD_EIM_OE__EIM_OE_B 0xb0f1 >> + MX6QDL_PAD_EIM_RW__EIM_RW 0xb0f1 >> + MX6QDL_PAD_EIM_WAIT__EIM_WAIT_B 0xb0f1 >> + MX6QDL_PAD_EIM_BCLK__EIM_BCLK 0xb0f1 >> + >; >> + }; >> + }; >> + >> + hog { >> + pinctrl_hog: hoggrp-novena { >> + fsl,pins = < >> + /* Peek array power */ >> + MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000 >> + >; >> + }; >> + }; > What is this used for? If possible please avoid using any hogs. > There is a pin labeled "5V PEEK" which is simply a 500 mA @ 5V power supply meant for use with userland. I suppose it should technically be a power-supply, but from what I understand power-supply devices cannot be manipulated from userspace. What approach should be taken here? >> + >> + pcie { >> + pinctrl_pcie_novena: pciegrp-novena { >> + fsl,pins = < >> + /* Reset */ >> + MX6QDL_PAD_EIM_D29__GPIO3_IO29 0x80000000 >> + >> + /* Power On */ >> + MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000 >> + >> + /* Wifi kill */ >> + MX6QDL_PAD_EIM_A22__GPIO2_IO16 0x80000000 >> + >; >> + }; >> + }; >> + >> + sata { >> + pinctrl_sata_novena: satagrp-novena { >> + fsl,pins = < >> + MX6QDL_PAD_EIM_D30__GPIO3_IO30 0x80000000 >> + >; >> + }; >> + }; >> + >> + senoko { >> + pinctrl_senoko_novena: senokogrp-novena { >> + fsl,pins = < >> + /* Senoko IRQ line */ >> + MX6QDL_PAD_SD1_CLK__GPIO1_IO20 0x13048 >> + >> + /* Senoko reset line */ >> + MX6QDL_PAD_CSI0_VSYNC__GPIO5_IO21 0x80000000 >> + >; >> + }; >> + }; >> + >> + sound { >> + pinctrl_sound_novena: soundgrp-novena { >> + fsl,pins = < >> + /* Audio power regulator */ >> + MX6QDL_PAD_DISP0_DAT23__GPIO5_IO17 0x80000000 >> + >> + /* Headphone plug */ >> + MX6QDL_PAD_DISP0_DAT21__GPIO5_IO15 0x80000000 >> + >> + MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x80000000 >> + >; >> + }; >> + }; >> + >> + ts { >> + pinctrl_stmpe_novena: stmpegrp-novena { >> + fsl,pins = < >> + /* Touchscreen interrupt */ >> + MX6QDL_PAD_DISP0_DAT19__GPIO5_IO13 0x80000000 >> + >; >> + }; >> + }; >> + >> + uart2 { >> + pinctrl_uart2_novena: uart2grp-novena { >> + fsl,pins = < >> + MX6QDL_PAD_EIM_D26__UART2_TX_DATA 0x1b0b1 >> + MX6QDL_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1 >> + >; >> + }; >> + }; >> + >> + uart3 { >> + pinctrl_uart3_novena: uart3grp-novena { >> + fsl,pins = < >> + MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1 >> + MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1 >> + >; >> + }; >> + }; >> + uart4 { >> + pinctrl_uart4_novena: uart4grp-novena { >> + fsl,pins = < >> + MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA 0x1b0b1 >> + MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1 >> + >; >> + }; >> + }; >> + >> + usbotg { >> + pinctrl_usbotg_novena: usbotggrp-novena { >> + fsl,pins = < >> + MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059 >> + >; >> + }; >> + }; >> + >> + usdhc2 { >> + pinctrl_usdhc2_novena: usdhc2grp-novena { >> + 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 0x17059 >> + >> + /* Write protect */ >> + MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000 >> + >> + /* Card detect */ >> + MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x80000000 >> + >; >> + }; >> + }; >> + >> + usdhc3 { >> + pinctrl_usdhc3_novena: usdhc3grp-novena { >> + 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 >> + >; >> + }; >> + }; >> +}; >> + >> +&kpp { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_kpp_novena>; >> + linux,keymap = < >> + MATRIX_KEY(1, 1, KEY_CONFIG) >> + >; >> + wakeup; > This probably needs a prefix. Good catch. imx_keypad.c calls device_init_wakeup(..., 1), meaning it's always a wakesource. This line can be dropped entirely. >> + status = "okay"; >> +}; >> + >> +&ldb { >> + fsl,dual-channel; >> + status = "okay"; >> + lvds-channel@0 { >> + fsl,data-mapping = "jeida"; >> + fsl,data-width = <24>; >> + fsl,panel = <&panel>; >> + status = "okay"; >> + }; >> +}; >> + >> +&pcie { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_pcie_novena>; >> + reset-gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>; >> + bus-supply = <®_pcie>; >> + status = "okay"; >> +}; >> + >> +&sata { >> + target-supply = <®_sata>; >> + fsl,transmit-level-mV = <1025>; >> + fsl,transmit-boost-mdB = <0>; >> + fsl,transmit-atten-16ths = <8>; >> + status = "okay"; >> +}; >> + >> +&ssi1 { >> + fsl,mode = "i2s-slave"; >> + status = "okay"; >> +}; >> + >> +&uart2 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_uart2_novena>; >> + status = "okay"; >> +}; >> + >> +&uart3 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_uart3_novena>; >> + status = "okay"; >> +}; >> + >> +&uart4 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_uart4_novena>; >> + status = "okay"; >> +}; >> + >> +&usbotg { >> + vbus-supply = <®_usb_otg_vbus>; >> + dr_mode = "otg"; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_usbotg_novena>; >> + disable-over-current; >> + status = "okay"; >> +}; >> + >> +&usbh1 { >> + vbus-supply = <&swbst_reg>; >> + status = "okay"; >> +}; >> + >> +&usdhc2 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_usdhc2_1>; >> + pinctrl-0 = <&pinctrl_usdhc2_novena>; >> + cd-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; >> + wp-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; >> + status = "okay"; >> +}; >> + >> +&usdhc3 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_usdhc3_novena>; >> + non-removable; >> + status = "okay"; >> +}; > ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 0/4] Add support for kosagi novena [not found] ` <1419237127-21763-1-git-send-email-xobs-nXMMniAx+RbQT0dZR+AlfA@public.gmane.org> 2014-12-22 8:32 ` [PATCH v2 4/4] ARM: dts: imx6q: add Novena board Sean Cross @ 2015-01-16 0:46 ` Bjorn Helgaas 2015-01-16 10:38 ` Sean Cross 1 sibling, 1 reply; 13+ messages in thread From: Bjorn Helgaas @ 2015-01-16 0:46 UTC (permalink / raw) To: Sean Cross Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Lucas Stach, Shawn Guo, devicetree-u79uwXL29TY76Z2rM5mHXA, Richard Zhu, Grant Likely, linux-pci-u79uwXL29TY76Z2rM5mHXA, bunnie-nXMMniAx+RbQT0dZR+AlfA On Mon, Dec 22, 2014 at 04:32:03PM +0800, Sean Cross wrote: > The Kosagi Novena mainboard contains an i.MX6, along with a PCI Express slot. > This patchset adds regulator support to the PCI Express slot, and adds > device tree support for the Novena mainboard. > > Changes since v1: > - Add 'kosagi' to vendor prefixes > - Add LCD panel to simple-panel > - Renamed power-supply to bus-supply > - Replaced devm_regulator_get() with devm_regulator_get_optional() > - Moved regulator_enable to imx6_add_pcie_port() > - Removed fpga@1 from spi definition in dts -- will use overlays instead > > Sean Cross (4): > drm/panel: simple: Add Innolux N133HSE panel support > devicetree: bindings: Add vendor prefix for Kosagi > PCI: imx6: Add power-supply support I guess we're waiting on a response to Arnd's question about making this more generic, so I'm dropping these from my queue pending that. Then we need a strategy for merging it since it crosses PCI/ARM/GPU. Please propose a strategy; it looks like the PCI part doesn't technically depend on the preceeding patches, but it's fine with me if you want to keep it all together. > ARM: dts: imx6q: add Novena board > > .../devicetree/bindings/pci/fsl,imx6q-pcie.txt | 3 + > .../devicetree/bindings/vendor-prefixes.txt | 1 + > arch/arm/boot/dts/Makefile | 1 + > arch/arm/boot/dts/imx6q-novena.dts | 856 +++++++++++++++++++++ > drivers/gpu/drm/panel/panel-simple.c | 26 + > drivers/pci/host/pci-imx6.c | 27 + > 6 files changed, 914 insertions(+) > create mode 100644 arch/arm/boot/dts/imx6q-novena.dts > > -- > 2.1.3 > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 0/4] Add support for kosagi novena 2015-01-16 0:46 ` [PATCH v2 0/4] Add support for kosagi novena Bjorn Helgaas @ 2015-01-16 10:38 ` Sean Cross [not found] ` <54B8EA1C.7070700-nXMMniAx+RbQT0dZR+AlfA@public.gmane.org> 0 siblings, 1 reply; 13+ messages in thread From: Sean Cross @ 2015-01-16 10:38 UTC (permalink / raw) To: Bjorn Helgaas Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Lucas Stach, Shawn Guo, devicetree, Richard Zhu, Grant Likely, linux-pci, bunnie On 16/01/2015 08:46, Bjorn Helgaas wrote: > On Mon, Dec 22, 2014 at 04:32:03PM +0800, Sean Cross wrote: >> The Kosagi Novena mainboard contains an i.MX6, along with a PCI Express slot. >> This patchset adds regulator support to the PCI Express slot, and adds >> device tree support for the Novena mainboard. >> >> Changes since v1: >> - Add 'kosagi' to vendor prefixes >> - Add LCD panel to simple-panel >> - Renamed power-supply to bus-supply >> - Replaced devm_regulator_get() with devm_regulator_get_optional() >> - Moved regulator_enable to imx6_add_pcie_port() >> - Removed fpga@1 from spi definition in dts -- will use overlays instead >> >> Sean Cross (4): >> drm/panel: simple: Add Innolux N133HSE panel support >> devicetree: bindings: Add vendor prefix for Kosagi >> PCI: imx6: Add power-supply support > I guess we're waiting on a response to Arnd's question about making this > more generic, so I'm dropping these from my queue pending that. > > Then we need a strategy for merging it since it crosses PCI/ARM/GPU. > Please propose a strategy; it looks like the PCI part doesn't technically > depend on the preceeding patches, but it's fine with me if you want to keep > it all together. > The PCI part was there because without it, the system hard-locks during boot without it. However, I'm not sure that the power-supply is the correct approach, because I can still see lockups even with the switch in place. I still haven't found out the root cause of that problem. One workaround is to simply enable that GPIO in the bootloader and leave it on permanently. Doing this mimics behavior on other platforms where PCIe is permanently powered up, and since the patches are decoupled the PCI patch can be applied at a later time. I'd prefer to drop the PCI patch for now. Would you like me to submit a v3 with simply the drm/panel and devicetree patches? >> ARM: dts: imx6q: add Novena board >> >> .../devicetree/bindings/pci/fsl,imx6q-pcie.txt | 3 + >> .../devicetree/bindings/vendor-prefixes.txt | 1 + >> arch/arm/boot/dts/Makefile | 1 + >> arch/arm/boot/dts/imx6q-novena.dts | 856 +++++++++++++++++++++ >> drivers/gpu/drm/panel/panel-simple.c | 26 + >> drivers/pci/host/pci-imx6.c | 27 + >> 6 files changed, 914 insertions(+) >> create mode 100644 arch/arm/boot/dts/imx6q-novena.dts >> >> -- >> 2.1.3 >> ^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <54B8EA1C.7070700-nXMMniAx+RbQT0dZR+AlfA@public.gmane.org>]
* Re: [PATCH v2 0/4] Add support for kosagi novena [not found] ` <54B8EA1C.7070700-nXMMniAx+RbQT0dZR+AlfA@public.gmane.org> @ 2015-01-16 10:44 ` Lucas Stach 0 siblings, 0 replies; 13+ messages in thread From: Lucas Stach @ 2015-01-16 10:44 UTC (permalink / raw) To: Sean Cross Cc: Bjorn Helgaas, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Shawn Guo, devicetree-u79uwXL29TY76Z2rM5mHXA, Richard Zhu, Grant Likely, linux-pci-u79uwXL29TY76Z2rM5mHXA, bunnie-nXMMniAx+RbQT0dZR+AlfA Am Freitag, den 16.01.2015, 18:38 +0800 schrieb Sean Cross: > On 16/01/2015 08:46, Bjorn Helgaas wrote: > > On Mon, Dec 22, 2014 at 04:32:03PM +0800, Sean Cross wrote: > >> The Kosagi Novena mainboard contains an i.MX6, along with a PCI Express slot. > >> This patchset adds regulator support to the PCI Express slot, and adds > >> device tree support for the Novena mainboard. > >> > >> Changes since v1: > >> - Add 'kosagi' to vendor prefixes > >> - Add LCD panel to simple-panel > >> - Renamed power-supply to bus-supply > >> - Replaced devm_regulator_get() with devm_regulator_get_optional() > >> - Moved regulator_enable to imx6_add_pcie_port() > >> - Removed fpga@1 from spi definition in dts -- will use overlays instead > >> > >> Sean Cross (4): > >> drm/panel: simple: Add Innolux N133HSE panel support > >> devicetree: bindings: Add vendor prefix for Kosagi > >> PCI: imx6: Add power-supply support > > I guess we're waiting on a response to Arnd's question about making this > > more generic, so I'm dropping these from my queue pending that. > > > > Then we need a strategy for merging it since it crosses PCI/ARM/GPU. > > Please propose a strategy; it looks like the PCI part doesn't technically > > depend on the preceeding patches, but it's fine with me if you want to keep > > it all together. > > > The PCI part was there because without it, the system hard-locks during > boot without it. > > However, I'm not sure that the power-supply is the correct approach, > because I can still see lockups even with the switch in place. I still > haven't found out the root cause of that problem. > > One workaround is to simply enable that GPIO in the bootloader and leave > it on permanently. Doing this mimics behavior on other platforms where > PCIe is permanently powered up, and since the patches are decoupled the > PCI patch can be applied at a later time. > > I'd prefer to drop the PCI patch for now. Would you like me to submit a > v3 with simply the drm/panel and devicetree patches? > Please keep the PCIe supply regulator in your DT, but just mark it always-on. I looked into moving the bus-supply into the common designware driver, but that needs some more work. I'll send out a series for this in the next days. We can then always hook up the regulator properly after this is done. Please wait a bit until sending V3, I want to have another look at the V2 novena DT. Regards, Lucas -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2015-01-30 6:48 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-22 8:32 [PATCH v2 0/4] Add support for kosagi novena Sean Cross
2014-12-22 8:32 ` [PATCH v2 1/4] drm/panel: simple: Add Innolux N133HSE panel support Sean Cross
2014-12-22 8:32 ` [PATCH v2 2/4] devicetree: bindings: Add vendor prefix for Kosagi Sean Cross
2014-12-26 21:00 ` Rob Herring
2014-12-22 8:32 ` [PATCH v2 3/4] PCI: imx6: Add power-supply support Sean Cross
2015-01-05 9:46 ` Lucas Stach
2015-01-05 15:31 ` Arnd Bergmann
[not found] ` <1419237127-21763-1-git-send-email-xobs-nXMMniAx+RbQT0dZR+AlfA@public.gmane.org>
2014-12-22 8:32 ` [PATCH v2 4/4] ARM: dts: imx6q: add Novena board Sean Cross
2015-01-19 10:04 ` Lucas Stach
2015-01-30 6:48 ` Sean Cross
2015-01-16 0:46 ` [PATCH v2 0/4] Add support for kosagi novena Bjorn Helgaas
2015-01-16 10:38 ` Sean Cross
[not found] ` <54B8EA1C.7070700-nXMMniAx+RbQT0dZR+AlfA@public.gmane.org>
2015-01-16 10:44 ` Lucas Stach
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).