| Message ID | 1396025579-14344-4-git-send-email-l.stach@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Mar 28, 2014 at 05:52:54PM +0100, Lucas Stach wrote: > The new bindings drops one clock, renames the others and > drops the old interrupt mapping. > > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> It does not apply on my branch, and I had to apply it manually. Please check my imx/dt branch to see if I did it right. Shawn
Am Mittwoch, den 30.04.2014, 14:02 +0800 schrieb Shawn Guo: > On Fri, Mar 28, 2014 at 05:52:54PM +0100, Lucas Stach wrote: > > The new bindings drops one clock, renames the others and > > drops the old interrupt mapping. > > > > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> > > It does not apply on my branch, and I had to apply it manually. Please > check my imx/dt branch to see if I did it right. > The diff as applied in your imx/dt looks good to me. Regards, Lucas
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index c1c06d25decc..1ea1adb6d8c6 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -128,15 +128,16 @@ 0x81000000 0 0 0x01f80000 0 0x00010000 /* downstream I/O */ 0x82000000 0 0x01000000 0x01000000 0 0x00f00000>; /* non-prefetchable memory */ num-lanes = <1>; - interrupts = <0 123 0x04>; + interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "msi"; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0x7>; interrupt-map = <0 0 0 1 &intc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, <0 0 0 2 &intc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>, <0 0 0 3 &intc GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>, <0 0 0 4 &intc GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clks 189>, <&clks 187>, <&clks 206>, <&clks 144>; - clock-names = "pcie_ref_125m", "sata_ref_100m", "lvds_gate", "pcie_axi"; + clocks = <&clks 144>, <&clks 206>, <&clks 189>; + clock-names = "pcie", "pcie_bus", "pcie_phy"; status = "disabled"; };
The new bindings drops one clock, renames the others and drops the old interrupt mapping. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> --- arch/arm/boot/dts/imx6qdl.dtsi | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)