Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d01300a6 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'oxnas-arm-soc-dt-for-4.11' of https://github.com/OXNAS/linux into next/dt 

- Add dt-bindings includes for OX820 and OX810SE dtsi
- Replace reset and clock magic numbers for OX820 and OX810SE

* tag 'oxnas-arm-soc-dt-for-4.11' of https://github.com/OXNAS/linux

:
  ARM: dts: OX820: Update with dt-bindings includes
  ARM: dts: OX810: Update with dt-bindings includes

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 70c6420c 0c5987d3

arch/arm/boot/dts/ox810se.dtsi

+6 −4
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
 */



/include/ "skeleton.dtsi"

#include <dt-bindings/clock/oxsemi,ox810se.h>

#include <dt-bindings/reset/oxsemi,ox810se.h>



/ {

	compatible = "oxsemi,ox810se";
@@ -242,7 +244,7 @@ 
			       current-speed = <115200>;

			       no-loopback-test;

			       status = "disabled";

			       resets = <&reset 17>;

			       resets = <&reset RESET_UART1>;

			};



			uart1: serial@300000 {
@@ -256,7 +258,7 @@ 
			       current-speed = <115200>;

			       no-loopback-test;

			       status = "disabled";

			       resets = <&reset 18>;

			       resets = <&reset RESET_UART2>;

			};



			uart2: serial@900000 {
@@ -270,7 +272,7 @@ 
			       current-speed = <115200>;

			       no-loopback-test;

			       status = "disabled";

			       resets = <&reset 22>;

			       resets = <&reset RESET_UART3>;

			};



			uart3: serial@a00000 {
@@ -284,7 +286,7 @@ 
			       current-speed = <115200>;

			       no-loopback-test;

			       status = "disabled";

			       resets = <&reset 23>;

			       resets = <&reset RESET_UART4>;

			};

		};

arch/arm/boot/dts/ox820.dtsi

+8 −6
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 


/include/ "skeleton.dtsi"

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/clock/oxsemi,ox820.h>

#include <dt-bindings/reset/oxsemi,ox820.h>



/ {

	compatible = "oxsemi,ox820";
@@ -83,8 +85,8 @@ 
		nandc: nand-controller@41000000 {

			compatible = "oxsemi,ox820-nand";

			reg = <0x41000000 0x100000>;

			clocks = <&stdclk 11>;

			resets = <&reset 15>;

			clocks = <&stdclk CLK_820_NAND>;

			resets = <&reset RESET_NAND>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";
@@ -99,9 +101,9 @@ 
			mac-address = [000000000000]; /* Filled in by U-Boot */

			phy-mode = "rgmii";



			clocks = <&stdclk 9>, <&gmacclk>;

			clocks = <&stdclk CLK_820_ETHA>, <&gmacclk>;

			clock-names = "gmac", "stmmaceth";

			resets = <&reset 6>;

			resets = <&reset RESET_MAC>;



			/* Regmap for sys registers */

			oxsemi,sys-ctrl = <&sys>;
@@ -208,7 +210,7 @@ 
			       no-loopback-test;

			       status = "disabled";

			       clocks = <&sysclk>;

			       resets = <&reset 17>;

			       resets = <&reset RESET_UART1>;

			};



			uart1: serial@300000 {
@@ -222,7 +224,7 @@ 
			       no-loopback-test;

			       status = "disabled";

			       clocks = <&sysclk>;

			       resets = <&reset 18>;

			       resets = <&reset RESET_UART2>;

			};



			rps@400000 {