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 >> -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
