On Wed, Oct 16, 2019 at 03:07:19PM +0000, Schrempf Frieder wrote:
> From: Frieder Schrempf <frieder.schrempf@xxxxxxxxxx>
>
> The Kontron N6311 and N6411 SoMs are very similar to N6310. In
> preparation to add support for them, we move the common nodes to a
> separate file imx6ul-kontron-n6x1x-som-common.dtsi.
>
> Signed-off-by: Frieder Schrempf <frieder.schrempf@xxxxxxxxxx>
> ---
> .../boot/dts/imx6ul-kontron-n6310-som.dtsi | 95 +-------------
> .../dts/imx6ul-kontron-n6x1x-som-common.dtsi | 123 ++++++++++++++++++
> 2 files changed, 124 insertions(+), 94 deletions(-)
> create mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi
>
> diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi b/arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi
> index a896b2348dd2..47d3ce5d255f 100644
> --- a/arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi
> +++ b/arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi
> @@ -6,7 +6,7 @@
> */
>
> #include "imx6ul.dtsi"
> -#include <dt-bindings/gpio/gpio.h>
> +#include "imx6ul-kontron-n6x1x-som-common.dtsi"
>
> / {
> model = "Kontron N6310 SOM";
> @@ -18,49 +18,7 @@
> };
> };
>
> -&ecspi2 {
> - cs-gpios = <&gpio4 22 GPIO_ACTIVE_HIGH>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&pinctrl_ecspi2>;
> - status = "okay";
> -
> - spi-flash@0 {
> - compatible = "mxicy,mx25v8035f", "jedec,spi-nor";
> - spi-max-frequency = <50000000>;
> - reg = <0>;
> - };
> -};
> -
> -&fec1 {
> - pinctrl-names = "default";
> - pinctrl-0 = <&pinctrl_enet1 &pinctrl_enet1_mdio>;
> - phy-mode = "rmii";
> - phy-handle = <ðphy1>;
> - status = "okay";
> -
> - mdio {
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - ethphy1: ethernet-phy@1 {
> - reg = <1>;
> - micrel,led-mode = <0>;
> - clocks = <&clks IMX6UL_CLK_ENET_REF>;
> - clock-names = "rmii-ref";
> - };
> - };
> -};
> -
> -&fec2 {
> - phy-mode = "rmii";
> - status = "disabled";
> -};
> -
> &qspi {
> - pinctrl-names = "default";
> - pinctrl-0 = <&pinctrl_qspi>;
> - status = "okay";
> -
> spi-flash@0 {
You left qspi and flash partitions here, while adding it later. It is
not pure move then and some duplicated stuff remains.
Best regards,
Krzysztof
