rockchip: dts: rk3328: Move OTG node's hnp-srp-disable to rk3328-u-boot.dtsi

[oweals/u-boot.git] / arch / arm / dts / imx6sx-sdb.dts

diff --git a/arch/arm/dts/imx6sx-sdb.dts b/arch/arm/dts/imx6sx-sdb.dts
index 6dd9bebfe027834fe445fad8408280e9cbf51ef3..5a63ca6157229ccc48d175f8045ef9446b203720 100644 (file)
--- a/arch/arm/dts/imx6sx-sdb.dts
+++ b/arch/arm/dts/imx6sx-sdb.dts
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2015 Freescale Semiconductor, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (C) 2015 Freescale Semiconductor, Inc.
 
 #include "imx6sx-sdb.dtsi"
 
@@ -117,15 +113,19 @@
                #size-cells = <1>;
                compatible = "micron,n25q256a", "jedec,spi-nor";
                spi-max-frequency = <29000000>;
+               spi-rx-bus-width = <4>;
+               spi-tx-bus-width = <4>;
                reg = <0>;
        };
 
-       flash1: n25q256a@1 {
+       flash1: n25q256a@2 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "micron,n25q256a", "jedec,spi-nor";
                spi-max-frequency = <29000000>;
-               reg = <1>;
+               spi-rx-bus-width = <4>;
+               spi-tx-bus-width = <4>;
+               reg = <2>;
        };
 };
 
@@ -136,3 +136,20 @@
 &reg_soc {
        vin-supply = <&sw1a_reg>;
 };
+
+&reg_vdd1p1 {
+       vin-supply = <&vgen6_reg>;
+};
+
+&reg_vdd2p5 {
+       vin-supply = <&vgen6_reg>;
+};
+
+&reg_can_stby {
+       /* Transceiver EN/STBY is active low on RevB board */
+       gpio = <&gpio4 27 GPIO_ACTIVE_LOW>;
+};
+
+&snvs_pwrkey {
+       status = "okay";
+};