diff options
| author | Uwe Kleine-König | 2015-07-31 11:16:06 +0200 |
|---|---|---|
| committer | Scott Wood | 2015-10-17 01:46:00 +0200 |
| commit | 78c102c24cd31ea4f242162e4ca721e75866fcba (patch) | |
| tree | 21aa661f9ccd0299c9fb78e984dff4e0e0febd82 /arch/powerpc/boot | |
| parent | powerpc/dts: Add and fix 1588 timer node for eTSEC (diff) | |
| download | kernel-qcow2-linux-78c102c24cd31ea4f242162e4ca721e75866fcba.tar.gz kernel-qcow2-linux-78c102c24cd31ea4f242162e4ca721e75866fcba.tar.xz kernel-qcow2-linux-78c102c24cd31ea4f242162e4ca721e75866fcba.zip | |
powerpc/dts: don't fall back to fsl,pq3-gpio for fsl,mpc8572-gpio
While the handling of fsl,pq3-gpio and fsl,mpc8572-gpio is done in the
same driver and the two hardly differ, the latter controller needs a
workaround for an erratum in the gpio_get callback. To make this
difference more explicit remove fsl,pq3-gpio from the list of
compatibles for mpc8572 machines.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'arch/powerpc/boot')
| -rw-r--r-- | arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi | 2 | ||||
| -rw-r--r-- | arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi b/arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi index c8b2daa40ac8..41935709ebe8 100644 --- a/arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi @@ -172,7 +172,7 @@ /* mark compat w/8572 to get some erratum treatment */ gpio-controller@f000 { - compatible = "fsl,mpc8572-gpio", "fsl,pq3-gpio"; + compatible = "fsl,mpc8572-gpio"; }; sata@18000 { diff --git a/arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi b/arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi index d44e25a48734..49294cf36b4e 100644 --- a/arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi @@ -162,7 +162,7 @@ /include/ "pq3-dma-1.dtsi" /include/ "pq3-gpio-0.dtsi" gpio-controller@f000 { - compatible = "fsl,mpc8572-gpio", "fsl,pq3-gpio"; + compatible = "fsl,mpc8572-gpio"; }; L2: l2-cache-controller@20000 { |