]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: dts: imx7d-sdb: Remove duplicate regulator-can2-3v3
authorLeonard Crestez <leonard.crestez@nxp.com>
Mon, 18 Jun 2018 13:11:09 +0000 (16:11 +0300)
committerShawn Guo <shawnguo@kernel.org>
Tue, 19 Jun 2018 02:55:12 +0000 (10:55 +0800)
Two different regulators are defined with the same name and label but
distinct properties.

The first definition was added with the first board dts and the second
was added when upstream added flexcan support.

Looking at schematics it is indeed gpio2 14 connected to the STB pin of
the CAN transceiver so remove the first definition.

The second definition entirely overrides the first so this already
worked and this patch results in no DTB change, just a cleanup.

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm/boot/dts/imx7d-sdb.dts

index 9408491631042d4adc816f7f9dec1c0b87a9aa23..9f9e6a1e3b7293f3378b011b69e6aaedb5661907 100644 (file)
@@ -71,14 +71,6 @@ reg_usb_otg2_vbus: regulator-usb-otg2-vbus {
                enable-active-high;
        };
 
-       reg_can2_3v3: regulator-can2-3v3 {
-               compatible = "regulator-fixed";
-               regulator-name = "can2-3v3";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               gpio = <&gpio1 7 GPIO_ACTIVE_LOW>;
-       };
-
        reg_vref_1v8: regulator-vref-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "vref-1v8";