| Message ID | 20181130075849.16941-4-wens@csie.org (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | media: sun6i: Separate H3 compatible from A31 | expand |
On Fri, Nov 30, 2018 at 1:29 PM Chen-Yu Tsai <wens@csie.org> wrote: > > The CSI controller found on the H3 (and H5) is a reduced version of the > one found on the A31. It only has 1 channel, instead of 4 channels for > time-multiplexed BT.656. Since the H3 is a reduced version, it cannot > "fallback" to a compatible that implements more features than it > supports. > > Drop the A31 fallback compatible. > > Fixes: f89120b6f554 ("ARM: dts: sun8i: Add the H3/H5 CSI controller") > Signed-off-by: Chen-Yu Tsai <wens@csie.org> > --- Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
On Mon, Dec 3, 2018 at 5:44 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > On Fri, Nov 30, 2018 at 1:29 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > The CSI controller found on the H3 (and H5) is a reduced version of the > > one found on the A31. It only has 1 channel, instead of 4 channels for > > time-multiplexed BT.656. Since the H3 is a reduced version, it cannot > > "fallback" to a compatible that implements more features than it > > supports. > > > > Drop the A31 fallback compatible. > > > > Fixes: f89120b6f554 ("ARM: dts: sun8i: Add the H3/H5 CSI controller") > > Signed-off-by: Chen-Yu Tsai <wens@csie.org> > > --- > > Reviewed-by: Jagan Teki <jagan@amarulasolutions.com> Merged for 5.1, as the accompanying driver changes were also merged for 5.1 ChenYu
diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi index 0d9e9eac518c..c9c9ec71945f 100644 --- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi +++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi @@ -752,8 +752,7 @@ }; csi: camera@1cb0000 { - compatible = "allwinner,sun8i-h3-csi", - "allwinner,sun6i-a31-csi"; + compatible = "allwinner,sun8i-h3-csi"; reg = <0x01cb0000 0x1000>; interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>; clocks = <&ccu CLK_BUS_CSI>,
The CSI controller found on the H3 (and H5) is a reduced version of the one found on the A31. It only has 1 channel, instead of 4 channels for time-multiplexed BT.656. Since the H3 is a reduced version, it cannot "fallback" to a compatible that implements more features than it supports. Drop the A31 fallback compatible. Fixes: f89120b6f554 ("ARM: dts: sun8i: Add the H3/H5 CSI controller") Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- arch/arm/boot/dts/sunxi-h3-h5.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)