460 lines
		
	
	
		
			8.5 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			460 lines
		
	
	
		
			8.5 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
| From a9d2b105ccd23e07e3dd99d010a34bd5d1c95b42 Mon Sep 17 00:00:00 2001
 | |
| From: Daniel Golle <daniel@makrotopia.org>
 | |
| Date: Sat, 13 Jan 2018 18:35:59 +0100
 | |
| Subject: [PATCH 1/3] ARM: dts: rename oxnas dts files
 | |
| 
 | |
| Other platforms' device-tree files start with a platform prefix, such as
 | |
| sun7i-a20-*.dts or at91-*.dts.
 | |
| This naming scheme turns out to be handy when using multi-platform build
 | |
| systems such as OpenWrt.
 | |
| Prepend oxnas files with their platform prefix to comply with the naming
 | |
| scheme already used for most other platforms.
 | |
| 
 | |
| Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 | |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de>
 | |
| ---
 | |
|  arch/arm/boot/dts/Makefile                                    | 4 ++--
 | |
|  arch/arm/boot/dts/{wd-mbwe.dts => ox810se-wd-mbwe.dts}        | 0
 | |
|  ...-series-3.dts => ox820-cloudengines-pogoplug-series-3.dts} | 0
 | |
|  3 files changed, 2 insertions(+), 2 deletions(-)
 | |
|  rename arch/arm/boot/dts/{wd-mbwe.dts => ox810se-wd-mbwe.dts} (100%)
 | |
|  rename arch/arm/boot/dts/{cloudengines-pogoplug-series-3.dts => ox820-cloudengines-pogoplug-series-3.dts} (100%)
 | |
| 
 | |
| --- a/arch/arm/boot/dts/Makefile
 | |
| +++ b/arch/arm/boot/dts/Makefile
 | |
| @@ -685,8 +685,8 @@ dtb-$(CONFIG_ARCH_ACTIONS) += \
 | |
|  dtb-$(CONFIG_ARCH_PRIMA2) += \
 | |
|  	prima2-evb.dtb
 | |
|  dtb-$(CONFIG_ARCH_OXNAS) += \
 | |
| -	wd-mbwe.dtb \
 | |
| -	cloudengines-pogoplug-series-3.dtb
 | |
| +	ox810se-wd-mbwe.dtb \
 | |
| +	ox820-cloudengines-pogoplug-series-3.dtb
 | |
|  dtb-$(CONFIG_ARCH_QCOM) += \
 | |
|  	qcom-apq8060-dragonboard.dtb \
 | |
|  	qcom-apq8064-arrow-sd-600eval.dtb \
 | |
| --- a/arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts
 | |
| +++ /dev/null
 | |
| @@ -1,94 +0,0 @@
 | |
| -/*
 | |
| - * cloudengines-pogoplug-series-3.dtsi - Device tree file for Cloud Engines PogoPlug Series 3
 | |
| - *
 | |
| - * Copyright (C) 2016 Neil Armstrong <narmstrong@baylibre.com>
 | |
| - *
 | |
| - * Licensed under GPLv2 or later
 | |
| - */
 | |
| -
 | |
| -/dts-v1/;
 | |
| -#include "ox820.dtsi"
 | |
| -
 | |
| -/ {
 | |
| -	model = "Cloud Engines PogoPlug Series 3";
 | |
| -
 | |
| -	compatible = "cloudengines,pogoplugv3", "oxsemi,ox820";
 | |
| -
 | |
| -	chosen {
 | |
| -		bootargs = "earlyprintk";
 | |
| -		stdout-path = "serial0:115200n8";
 | |
| -	};
 | |
| -
 | |
| -	memory {
 | |
| -		/* 128Mbytes DDR */
 | |
| -		reg = <0x60000000 0x8000000>;
 | |
| -	};
 | |
| -
 | |
| -	aliases {
 | |
| -		serial0 = &uart0;
 | |
| -		gpio0 = &gpio0;
 | |
| -		gpio1 = &gpio1;
 | |
| -	};
 | |
| -
 | |
| -	leds {
 | |
| -		compatible = "gpio-leds";
 | |
| -
 | |
| -		blue {
 | |
| -			label = "pogoplug:blue";
 | |
| -			gpios = <&gpio0 2 0>;
 | |
| -			default-state = "keep";
 | |
| -		};
 | |
| -
 | |
| -		orange {
 | |
| -			label = "pogoplug:orange";
 | |
| -			gpios = <&gpio1 16 1>;
 | |
| -			default-state = "keep";
 | |
| -		};
 | |
| -
 | |
| -		green {
 | |
| -			label = "pogoplug:green";
 | |
| -			gpios = <&gpio1 17 1>;
 | |
| -			default-state = "keep";
 | |
| -		};
 | |
| -	};
 | |
| -};
 | |
| -
 | |
| -&uart0 {
 | |
| -	status = "okay";
 | |
| -
 | |
| -	pinctrl-names = "default";
 | |
| -	pinctrl-0 = <&pinctrl_uart0>;
 | |
| -};
 | |
| -
 | |
| -&nandc {
 | |
| -	status = "okay";
 | |
| -
 | |
| -	pinctrl-names = "default";
 | |
| -	pinctrl-0 = <&pinctrl_nand>;
 | |
| -
 | |
| -	nand@0 {
 | |
| -		reg = <0>;
 | |
| -		#address-cells = <1>;
 | |
| -		#size-cells = <1>;
 | |
| -		nand-ecc-mode = "soft";
 | |
| -		nand-ecc-algo = "hamming";
 | |
| -
 | |
| -		partition@0 {
 | |
| -			label = "boot";
 | |
| -			reg = <0x00000000 0x00e00000>;
 | |
| -			read-only;
 | |
| -		};
 | |
| -
 | |
| -		partition@e00000 {
 | |
| -			label = "ubi";
 | |
| -			reg = <0x00e00000 0x07200000>;
 | |
| -		};
 | |
| -	};
 | |
| -};
 | |
| -
 | |
| -ða {
 | |
| -	status = "okay";
 | |
| -
 | |
| -	pinctrl-names = "default";
 | |
| -	pinctrl-0 = <&pinctrl_etha_mdio>;
 | |
| -};
 | |
| --- /dev/null
 | |
| +++ b/arch/arm/boot/dts/ox810se-wd-mbwe.dts
 | |
| @@ -0,0 +1,112 @@
 | |
| +/*
 | |
| + * wd-mbwe.dtsi - Device tree file for Western Digital My Book World Edition
 | |
| + *
 | |
| + * Copyright (C) 2016 Neil Armstrong <narmstrong@baylibre.com>
 | |
| + *
 | |
| + * Licensed under GPLv2 or later
 | |
| + */
 | |
| +
 | |
| +/dts-v1/;
 | |
| +#include "ox810se.dtsi"
 | |
| +
 | |
| +/ {
 | |
| +	model = "Western Digital My Book World Edition";
 | |
| +
 | |
| +	compatible = "wd,mbwe", "oxsemi,ox810se";
 | |
| +
 | |
| +	chosen {
 | |
| +		bootargs = "console=ttyS1,115200n8 earlyprintk=serial";
 | |
| +	};
 | |
| +
 | |
| +	memory {
 | |
| +		/* 128Mbytes DDR */
 | |
| +		reg = <0x48000000 0x8000000>;
 | |
| +	};
 | |
| +
 | |
| +	aliases {
 | |
| +		serial1 = &uart1;
 | |
| +		gpio0 = &gpio0;
 | |
| +		gpio1 = &gpio1;
 | |
| +	};
 | |
| +
 | |
| +	gpio-keys-polled {
 | |
| +		compatible = "gpio-keys-polled";
 | |
| +		#address-cells = <1>;
 | |
| +		#size-cells = <0>;
 | |
| +		poll-interval = <100>;
 | |
| +
 | |
| +		power {
 | |
| +			label = "power";
 | |
| +			gpios = <&gpio0 0 1>;
 | |
| +			linux,code = <0x198>;
 | |
| +		};
 | |
| +
 | |
| +		recovery {
 | |
| +			label = "recovery";
 | |
| +			gpios = <&gpio0 4 1>;
 | |
| +			linux,code = <0xab>;
 | |
| +		};
 | |
| +	};
 | |
| +
 | |
| +	leds {
 | |
| +		compatible = "gpio-leds";
 | |
| +
 | |
| +		a0 {
 | |
| +			label = "activity0";
 | |
| +			gpios = <&gpio0 25 0>;
 | |
| +			default-state = "keep";
 | |
| +		};
 | |
| +
 | |
| +		a1 {
 | |
| +			label = "activity1";
 | |
| +			gpios = <&gpio0 26 0>;
 | |
| +			default-state = "keep";
 | |
| +		};
 | |
| +
 | |
| +		a2 {
 | |
| +			label = "activity2";
 | |
| +			gpios = <&gpio0 5 0>;
 | |
| +			default-state = "keep";
 | |
| +		};
 | |
| +
 | |
| +		a3 {
 | |
| +			label = "activity3";
 | |
| +			gpios = <&gpio0 6 0>;
 | |
| +			default-state = "keep";
 | |
| +		};
 | |
| +
 | |
| +		a4 {
 | |
| +			label = "activity4";
 | |
| +			gpios = <&gpio0 7 0>;
 | |
| +			default-state = "keep";
 | |
| +		};
 | |
| +
 | |
| +		a5 {
 | |
| +			label = "activity5";
 | |
| +			gpios = <&gpio1 2 0>;
 | |
| +			default-state = "keep";
 | |
| +		};
 | |
| +	};
 | |
| +
 | |
| +	i2c-gpio {
 | |
| +		compatible = "i2c-gpio";
 | |
| +		gpios = <&gpio0 3 0 /* sda */
 | |
| +			 &gpio0 2 0 /* scl */
 | |
| +			 >;
 | |
| +		i2c-gpio,delay-us = <2>;        /* ~100 kHz */
 | |
| +		#address-cells = <1>;
 | |
| +		#size-cells = <0>;
 | |
| +
 | |
| +		rtc0: rtc@48 {
 | |
| +			compatible = "st,m41t00";
 | |
| +			reg = <0x68>;
 | |
| +		};
 | |
| +	};
 | |
| +};
 | |
| +
 | |
| +&uart1 {
 | |
| +	status = "okay";
 | |
| +
 | |
| +	pinctrl-names = "default";
 | |
| +	pinctrl-0 = <&pinctrl_uart1>;
 | |
| +};
 | |
| --- /dev/null
 | |
| +++ b/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
 | |
| @@ -0,0 +1,94 @@
 | |
| +/*
 | |
| + * cloudengines-pogoplug-series-3.dtsi - Device tree file for Cloud Engines PogoPlug Series 3
 | |
| + *
 | |
| + * Copyright (C) 2016 Neil Armstrong <narmstrong@baylibre.com>
 | |
| + *
 | |
| + * Licensed under GPLv2 or later
 | |
| + */
 | |
| +
 | |
| +/dts-v1/;
 | |
| +#include "ox820.dtsi"
 | |
| +
 | |
| +/ {
 | |
| +	model = "Cloud Engines PogoPlug Series 3";
 | |
| +
 | |
| +	compatible = "cloudengines,pogoplugv3", "oxsemi,ox820";
 | |
| +
 | |
| +	chosen {
 | |
| +		bootargs = "earlyprintk";
 | |
| +		stdout-path = "serial0:115200n8";
 | |
| +	};
 | |
| +
 | |
| +	memory {
 | |
| +		/* 128Mbytes DDR */
 | |
| +		reg = <0x60000000 0x8000000>;
 | |
| +	};
 | |
| +
 | |
| +	aliases {
 | |
| +		serial0 = &uart0;
 | |
| +		gpio0 = &gpio0;
 | |
| +		gpio1 = &gpio1;
 | |
| +	};
 | |
| +
 | |
| +	leds {
 | |
| +		compatible = "gpio-leds";
 | |
| +
 | |
| +		blue {
 | |
| +			label = "pogoplug:blue";
 | |
| +			gpios = <&gpio0 2 0>;
 | |
| +			default-state = "keep";
 | |
| +		};
 | |
| +
 | |
| +		orange {
 | |
| +			label = "pogoplug:orange";
 | |
| +			gpios = <&gpio1 16 1>;
 | |
| +			default-state = "keep";
 | |
| +		};
 | |
| +
 | |
| +		green {
 | |
| +			label = "pogoplug:green";
 | |
| +			gpios = <&gpio1 17 1>;
 | |
| +			default-state = "keep";
 | |
| +		};
 | |
| +	};
 | |
| +};
 | |
| +
 | |
| +&uart0 {
 | |
| +	status = "okay";
 | |
| +
 | |
| +	pinctrl-names = "default";
 | |
| +	pinctrl-0 = <&pinctrl_uart0>;
 | |
| +};
 | |
| +
 | |
| +&nandc {
 | |
| +	status = "okay";
 | |
| +
 | |
| +	pinctrl-names = "default";
 | |
| +	pinctrl-0 = <&pinctrl_nand>;
 | |
| +
 | |
| +	nand@0 {
 | |
| +		reg = <0>;
 | |
| +		#address-cells = <1>;
 | |
| +		#size-cells = <1>;
 | |
| +		nand-ecc-mode = "soft";
 | |
| +		nand-ecc-algo = "hamming";
 | |
| +
 | |
| +		partition@0 {
 | |
| +			label = "boot";
 | |
| +			reg = <0x00000000 0x00e00000>;
 | |
| +			read-only;
 | |
| +		};
 | |
| +
 | |
| +		partition@e00000 {
 | |
| +			label = "ubi";
 | |
| +			reg = <0x00e00000 0x07200000>;
 | |
| +		};
 | |
| +	};
 | |
| +};
 | |
| +
 | |
| +ða {
 | |
| +	status = "okay";
 | |
| +
 | |
| +	pinctrl-names = "default";
 | |
| +	pinctrl-0 = <&pinctrl_etha_mdio>;
 | |
| +};
 | |
| --- a/arch/arm/boot/dts/wd-mbwe.dts
 | |
| +++ /dev/null
 | |
| @@ -1,112 +0,0 @@
 | |
| -/*
 | |
| - * wd-mbwe.dtsi - Device tree file for Western Digital My Book World Edition
 | |
| - *
 | |
| - * Copyright (C) 2016 Neil Armstrong <narmstrong@baylibre.com>
 | |
| - *
 | |
| - * Licensed under GPLv2 or later
 | |
| - */
 | |
| -
 | |
| -/dts-v1/;
 | |
| -#include "ox810se.dtsi"
 | |
| -
 | |
| -/ {
 | |
| -	model = "Western Digital My Book World Edition";
 | |
| -
 | |
| -	compatible = "wd,mbwe", "oxsemi,ox810se";
 | |
| -
 | |
| -	chosen {
 | |
| -		bootargs = "console=ttyS1,115200n8 earlyprintk=serial";
 | |
| -	};
 | |
| -
 | |
| -	memory {
 | |
| -		/* 128Mbytes DDR */
 | |
| -		reg = <0x48000000 0x8000000>;
 | |
| -	};
 | |
| -
 | |
| -	aliases {
 | |
| -		serial1 = &uart1;
 | |
| -		gpio0 = &gpio0;
 | |
| -		gpio1 = &gpio1;
 | |
| -	};
 | |
| -
 | |
| -	gpio-keys-polled {
 | |
| -		compatible = "gpio-keys-polled";
 | |
| -		#address-cells = <1>;
 | |
| -		#size-cells = <0>;
 | |
| -		poll-interval = <100>;
 | |
| -
 | |
| -		power {
 | |
| -			label = "power";
 | |
| -			gpios = <&gpio0 0 1>;
 | |
| -			linux,code = <0x198>;
 | |
| -		};
 | |
| -
 | |
| -		recovery {
 | |
| -			label = "recovery";
 | |
| -			gpios = <&gpio0 4 1>;
 | |
| -			linux,code = <0xab>;
 | |
| -		};
 | |
| -	};
 | |
| -
 | |
| -	leds {
 | |
| -		compatible = "gpio-leds";
 | |
| -
 | |
| -		a0 {
 | |
| -			label = "activity0";
 | |
| -			gpios = <&gpio0 25 0>;
 | |
| -			default-state = "keep";
 | |
| -		};
 | |
| -
 | |
| -		a1 {
 | |
| -			label = "activity1";
 | |
| -			gpios = <&gpio0 26 0>;
 | |
| -			default-state = "keep";
 | |
| -		};
 | |
| -
 | |
| -		a2 {
 | |
| -			label = "activity2";
 | |
| -			gpios = <&gpio0 5 0>;
 | |
| -			default-state = "keep";
 | |
| -		};
 | |
| -
 | |
| -		a3 {
 | |
| -			label = "activity3";
 | |
| -			gpios = <&gpio0 6 0>;
 | |
| -			default-state = "keep";
 | |
| -		};
 | |
| -
 | |
| -		a4 {
 | |
| -			label = "activity4";
 | |
| -			gpios = <&gpio0 7 0>;
 | |
| -			default-state = "keep";
 | |
| -		};
 | |
| -
 | |
| -		a5 {
 | |
| -			label = "activity5";
 | |
| -			gpios = <&gpio1 2 0>;
 | |
| -			default-state = "keep";
 | |
| -		};
 | |
| -	};
 | |
| -
 | |
| -	i2c-gpio {
 | |
| -		compatible = "i2c-gpio";
 | |
| -		gpios = <&gpio0 3 0 /* sda */
 | |
| -			 &gpio0 2 0 /* scl */
 | |
| -			 >;
 | |
| -		i2c-gpio,delay-us = <2>;        /* ~100 kHz */
 | |
| -		#address-cells = <1>;
 | |
| -		#size-cells = <0>;
 | |
| -
 | |
| -		rtc0: rtc@48 {
 | |
| -			compatible = "st,m41t00";
 | |
| -			reg = <0x68>;
 | |
| -		};
 | |
| -	};
 | |
| -};
 | |
| -
 | |
| -&uart1 {
 | |
| -	status = "okay";
 | |
| -
 | |
| -	pinctrl-names = "default";
 | |
| -	pinctrl-0 = <&pinctrl_uart1>;
 | |
| -};
 | 
