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

Commit 9ef1375d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt 

Pull "First batch of DT changes for 4.2" from Nicolas Ferre:

- cleanup and addition of Overkiz boards
- at91sam9x5: pwm0 pinctrl definition
- delete deprecated mainck nodes

* tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/dt: drop deprecated mainck node from pmc
  ARM: at91/dt: add support for kizbox2
  ARM: at91/dt: add support for kizboxmini
  ARM: at91/dt: sam9x5: add pinctrl for pwm0
  ARM: at91/dt: at91-kizbox: update chosen node
  ARM: at91/dt: at91-kizbox: re-size nand partitions
  ARM: at91/dt: at91-kizbox: leds related changes
  ARM: at91/dt: at91-kizbox: gpio-keys related changes
  ARM: at91/dt: at91-kizbox: user proper serial uart
  ARM: at91/dt: at91-kizbox: sanitize file
  ARM: at91/dt: kizbox: rename to at91-kizbox
parents 0b148010 7107bb0b

arch/arm/boot/dts/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ dtb-$(CONFIG_SOC_SAM_V4_V5) += \ 
	tny_a9263.dtb \

	usb_a9263.dtb \

	at91-foxg20.dtb \

	at91-kizbox.dtb \

	at91sam9g20ek.dtb \

	at91sam9g20ek_2mmc.dtb \

	kizbox.dtb \

	tny_a9g20.dtb \

	usb_a9g20.dtb \

	usb_a9g20_lpw.dtb \
@@ -32,12 +32,14 @@ dtb-$(CONFIG_SOC_SAM_V4_V5) += \ 
	at91sam9rlek.dtb \

	at91-ariag25.dtb \

	at91-cosino_mega2560.dtb \

	at91-kizboxmini.dtb \

	at91sam9g15ek.dtb \

	at91sam9g25ek.dtb \

	at91sam9g35ek.dtb \

	at91sam9x25ek.dtb \

	at91sam9x35ek.dtb

dtb-$(CONFIG_SOC_SAM_V7) += \

	at91-kizbox2.dtb \

	at91-sama5d3_xplained.dtb \

	sama5d31ek.dtb \

	sama5d33ek.dtb \

arch/arm/boot/dts/kizbox.dts→arch/arm/boot/dts/at91-kizbox.dts

+159 −0
Original line number Diff line number Diff line 
/*

 * kizbox.dts - Device Tree file for Overkiz Kizbox board

 * at91-kizbox.dts - Device Tree file for Overkiz Kizbox board

 *

 * Copyright (C) 2012 Boris BREZILLON <linux-arm@overkiz.com>

 * Copyright (C) 2012-2014 Boris BREZILLON <b.brezillon@overkiz.com>

 *               2014-2015 Gaël PORTAY <g.portay@overkiz.com>

 *

 * Licensed under GPLv2.

 * Licensed under GPLv2 or later.

 */

/dts-v1/;

#include "at91sam9g20.dtsi"

#include <dt-bindings/pwm/pwm.h>



/ {



	model = "Overkiz kizbox";

	model = "Overkiz Kizbox";

	compatible = "overkiz,kizbox", "atmel,at91sam9g20", "atmel,at91sam9";



	chosen {

		bootargs = "panic=5 ubi.mtd=1 rootfstype=ubifs root=ubi0:root";

		bootargs = "ubi.mtd=ubi";

		linux,stdout-path = &dbgu;

	};



	memory {
@@ -38,22 +40,18 @@ 


	ahb {

		apb {

			dbgu: serial@fffff200 {

				status = "okay";

			};



			usart0: serial@fffb0000 {

			macb0: ethernet@fffc4000 {

				phy-mode = "mii";

				pinctrl-0 = <&pinctrl_macb_rmii

				             &pinctrl_macb_rmii_mii_alt>;

				status = "okay";

			};



			usart1: serial@fffb4000 {

			usart3: serial@fffd0000 {

				status = "okay";

			};



			macb0: ethernet@fffc4000 {

				phy-mode = "mii";

				pinctrl-0 = <&pinctrl_macb_rmii

				             &pinctrl_macb_rmii_mii_alt>;

			dbgu: serial@fffff200 {

				status = "okay";

			};
@@ -65,86 +63,97 @@ 
			};

		};



		usb0: ohci@00500000 {

			num-ports = <1>;

			status = "okay";

		};



		nand0: nand@40000000 {

			nand-bus-width = <8>;

			nand-ecc-mode = "soft";

			status = "okay";



			bootloaderkernel@0 {

				label = "bootloader-kernel";

				reg = <0x0 0xc0000>;

			bootstrap@0 {

				label = "bootstrap";

				reg = <0x0 0x20000>;

			};



			ubi@c0000 {

			ubi@20000 {

				label = "ubi";

				reg = <0xc0000 0x7f40000>;

				reg = <0x20000 0x7fe0000>;

			};

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		reset {

			label = "PB_RST";

			gpios = <&pioB 30 GPIO_ACTIVE_HIGH>;

			linux,code = <0x100>;

			gpio-key,wakeup;

		};



		usb0: ohci@00500000 {

			num-ports = <1>;

			status = "okay";

		user {

			label = "PB_USER";

			gpios = <&pioB 31 GPIO_ACTIVE_HIGH>;

			linux,code = <0x101>;

			gpio-key,wakeup;

		};

	};



	i2c@0 {

		status = "okay";



		pcf8563@51 {

			/* nxp pcf8563 rtc */

		rtc: pcf8563@51 {

			compatible = "nxp,pcf8563";

			reg = <0x51>;

		};



	};



	leds {

		compatible = "gpio-leds";

	pwm_leds {

		compatible = "pwm-leds";



		led1g {

			label = "led1:green";

			gpios = <&pioB 0 GPIO_ACTIVE_LOW>;

			linux,default-trigger = "none";

		network_green {

			label = "pwm:green:network";

			pwms = <&tcb_pwm 2 10000000 PWM_POLARITY_INVERTED>;

			max-brightness = <255>;

			linux,default-trigger = "default-on";

		};



		led1r {

			label = "led1:red";

			gpios = <&pioB 1 GPIO_ACTIVE_LOW>;

			linux,default-trigger = "none";

		network_red {

			label = "pwm:red:network";

			pwms = <&tcb_pwm 3 10000000 PWM_POLARITY_INVERTED>;

			max-brightness = <255>;

			linux,default-trigger = "default-on";

		};



		led2g {

			label = "led2:green";

			gpios = <&pioB 2 GPIO_ACTIVE_LOW>;

			linux,default-trigger = "none";

			default-state = "on";

		user_green {

			label = "pwm:green:user";

			pwms = <&tcb_pwm 0 10000000 PWM_POLARITY_INVERTED>;

			max-brightness = <255>;

			linux,default-trigger = "default-on";

		};



		led2r {

			label = "led2:red";

			gpios = <&pioB 3 GPIO_ACTIVE_LOW>;

			linux,default-trigger = "none";

		};

		user_red {

			label = "pwm:red:user";

			pwms = <&tcb_pwm 1 10000000 PWM_POLARITY_INVERTED>;

			max-brightness = <255>;

			linux,default-trigger = "default-on";

		};



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		reset {

			label = "reset";

			gpios = <&pioB 30 GPIO_ACTIVE_LOW>;

			linux,code = <0x100>;

			gpio-key,wakeup;

	};



		mode {

			label = "mode";

			gpios = <&pioB 31 GPIO_ACTIVE_LOW>;

			linux,code = <0x101>;

			gpio-key,wakeup;

		};

	tcb_pwm: pwm {

		compatible = "atmel,tcb-pwm";

		#pwm-cells = <3>;

		tc-block = <1>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_tcb1_tioa0

			     &pinctrl_tcb1_tioa1

			     &pinctrl_tcb1_tioa2

			     &pinctrl_tcb1_tiob0>;

	};

};

arch/arm/boot/dts/at91-kizbox2.dts

0 → 100644
+216 −0
Original line number Diff line number Diff line 
/*

 * at91-kizbox2.dts - Device Tree file for Overkiz Kizbox 2 board

 *

 * Copyright (C) 2014 Gaël PORTAY <g.portay@overkiz.com>

 *

 * Licensed under GPLv2 or later.

 */

/dts-v1/;

#include "sama5d31.dtsi"

#include <dt-bindings/pwm/pwm.h>



/ {

	model = "Overkiz Kizbox 2";

	compatible = "overkiz,kizbox2", "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5";



	chosen {

		bootargs = "ubi.mtd=ubi";

		linux,stdout-path = &dbgu;

	};



	memory {

		reg = <0x20000000 0x10000000>;

	};



	clocks {

		slow_xtal {

			clock-frequency = <32768>;

		};



		main_xtal {

			clock-frequency = <12000000>;

		};

	};



	ahb {

		apb {

			i2c1: i2c@f0018000 {

				status = "okay";



				pmic: act8865@5b {

					compatible = "active-semi,act8865";

					reg = <0x5b>;

					status = "okay";



					regulators {

						vcc_1v8_reg: DCDC_REG1 {

							regulator-name = "VCC_1V8";

							regulator-min-microvolt = <1800000>;

							regulator-max-microvolt = <1800000>;

							regulator-always-on;

						};



						vcc_1v2_reg: DCDC_REG2 {

							regulator-name = "VCC_1V2";

							regulator-min-microvolt = <1200000>;

							regulator-max-microvolt = <1200000>;

							regulator-always-on;

						};



						vcc_3v3_reg: DCDC_REG3 {

							regulator-name = "VCC_3V3";

							regulator-min-microvolt = <3300000>;

							regulator-max-microvolt = <3300000>;

							regulator-always-on;

						};



						vddfuse_reg: LDO_REG1 {

							regulator-name = "FUSE_2V5";

							regulator-min-microvolt = <2500000>;

							regulator-max-microvolt = <2500000>;

						};



						vddana_reg: LDO_REG2 {

							regulator-name = "VDDANA";

							regulator-min-microvolt = <3300000>;

							regulator-max-microvolt = <3300000>;

							regulator-always-on;

						};



						vled_reg: LDO_REG3 {

							regulator-name = "VLED";

							regulator-min-microvolt = <3300000>;

							regulator-max-microvolt = <3300000>;

							regulator-always-on;

						};



						v3v8_rf_reg: LDO_REG4 {

							regulator-name = "V3V8_RF";

							regulator-min-microvolt = <3800000>;

							regulator-max-microvolt = <3800000>;

							regulator-always-on;

						};

					};

				};

			};



			usart0: serial@f001c000 {

				status = "okay";

			};



			usart1: serial@f0020000 {

				status = "okay";

			};



			pwm0: pwm@f002c000 {

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_pwm0_pwmh0_1

					     &pinctrl_pwm0_pwmh1_1

					     &pinctrl_pwm0_pwmh2_0>;

				status = "okay";

			};



			adc0: adc@f8018000 {

				atmel,adc-vref = <3333>;

				status = "okay";

			};



			usart2: serial@f8020000 {

				status = "okay";

			};



			macb1: ethernet@f802c000 {

				phy-mode = "rmii";

				status = "okay";

			};



			dbgu: serial@ffffee00 {

				status = "okay";

			};



			watchdog@fffffe40 {

				status = "okay";

			};

		};



		usb1: ohci@00600000 {

			status = "okay";

		};



		usb2: ehci@00700000 {

			status = "okay";

		};



		nand0: nand@60000000 {

			nand-bus-width = <8>;

			nand-ecc-mode = "hw";

			atmel,has-pmecc;

			atmel,pmecc-cap = <4>;

			atmel,pmecc-sector-size = <512>;

			nand-on-flash-bbt;

			status = "okay";



			bootstrap@0 {

				label = "bootstrap";

				reg = <0x0 0x20000>;

			};



			ubi@20000 {

				label = "ubi";

				reg = <0x20000 0x7fe0000>;

			};

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		prog {

			label = "PB_PROG";

			gpios = <&pioE 27 GPIO_ACTIVE_LOW>;

			linux,code = <0x102>;

			gpio-key,wakeup;

		};



		reset {

			label = "PB_RST";

			gpios = <&pioE 29 GPIO_ACTIVE_LOW>;

			linux,code = <0x100>;

			gpio-key,wakeup;

		};



		user {

			label = "PB_USER";

			gpios = <&pioE 31 GPIO_ACTIVE_HIGH>;

			linux,code = <0x101>;

			gpio-key,wakeup;

		};

	};



	pwm_leds {

		compatible = "pwm-leds";



		blue {

			label = "pwm:blue:user";

			pwms = <&pwm0 2 10000000 0>;

			max-brightness = <255>;

			linux,default-trigger = "default-on";

		};



		green {

			label = "pwm:green:user";

			pwms = <&pwm0 1 10000000 0>;

			max-brightness = <255>;

			linux,default-trigger = "default-on";

		};



		red {

			label = "pwm:red:user";

			pwms = <&pwm0 0 10000000 0>;

			max-brightness = <255>;

			linux,default-trigger = "default-on";

		};

	};

};

arch/arm/boot/dts/at91-kizboxmini.dts

0 → 100644
+129 −0
Original line number Diff line number Diff line 
/*

 * at91-kizboxmini.dts - Device Tree file for Overkiz Kizbox mini board

 *

 * Copyright (C) 2014 Gaël PORTAY <g.portay@overkiz.com>

 *

 * Licensed under GPLv2 or later.

 */

/dts-v1/;

#include "at91sam9g25.dtsi"

#include <dt-bindings/pwm/pwm.h>



/ {

	model = "Overkiz Kizbox mini";

	compatible = "overkiz,kizboxmini", "atmel,at91sam9g25", "atmel,at91sam9x5", "atmel,at91sam9";



	chosen {

		bootargs = "ubi.mtd=ubi";

		linux,stdout-path = &dbgu;

	};



	memory {

		reg = <0x20000000 0x8000000>;

	};



	clocks {

		slow_xtal {

			clock-frequency = <32768>;

		};



		main_xtal {

			clock-frequency = <12000000>;

		};

	};



	ahb {

		apb {

			usart0: serial@f801c000 {

				status = "okay";

			};



			macb0: ethernet@f802c000 {

				phy-mode = "rmii";

				status = "okay";

			};



			pwm0: pwm@f8034000 {

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_pwm0_pwm0_1

					     &pinctrl_pwm0_pwm1_1>;

				status = "okay";

			};



			dbgu: serial@fffff200 {

				status = "okay";

			};



			watchdog@fffffe40 {

				status = "okay";

			};

		};



		usb0: ohci@00600000 {

			num-ports = <1>;

			status = "okay";

		};



		usb1: ehci@00700000 {

			status = "okay";

		};



		nand0: nand@40000000 {

			nand-bus-width = <8>;

			nand-ecc-mode = "hw";

			atmel,has-pmecc;

			atmel,pmecc-cap = <4>;

			atmel,pmecc-sector-size = <512>;

			nand-on-flash-bbt;

			status = "okay";



			bootstrap@0 {

				label = "bootstrap";

				reg = <0x0 0x20000>;

			};



			ubi@20000 {

				label = "ubi";

				reg = <0x20000 0x7fe0000>;

			};

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		prog {

			label = "PB_PROG";

			gpios = <&pioC 17 GPIO_ACTIVE_LOW>;

			linux,code = <0x102>;

			gpio-key,wakeup;

		};



		reset {

			label = "PB_RST";

			gpios = <&pioC 16 GPIO_ACTIVE_LOW>;

			linux,code = <0x100>;

			gpio-key,wakeup;

		};

	};



	pwm_leds {

		compatible = "pwm-leds";



		green {

			label = "pwm:green:user";

			pwms = <&pwm0 0 10000000 0>;

			max-brightness = <255>;

			linux,default-trigger = "default-on";

		};



		red {

			label = "pwm:red:user";

			pwms = <&pwm0 1 10000000 0>;

			max-brightness = <255>;

			linux,default-trigger = "default-on";

		};

	};

};

arch/arm/boot/dts/at91-sama5d3_xplained.dts

+0 −6
Original line number Diff line number Diff line
@@ -215,12 +215,6 @@ 
					};

				};

			};



			pmc: pmc@fffffc00 {

				main: mainck {

					clock-frequency = <12000000>;

				};

			};

		};



		nand0: nand@60000000 {