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

Commit 0bab7359 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

First DT batch for 4.7, additions for sama5d2 SoC:
- chipid node to identify the SoC
- SFR node (Special Function Registers)
- LCD controller's node

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

:
  ARM: dts: at91: sama5d2: add LCD controller
  ARM: dts: at91: sama5d2: add chipid node
  ARM: dts: at91: sama5d2: add SFR node

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents bf162006 fd718627

Documentation/devicetree/bindings/arm/atmel-at91.txt

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ elsewhere. 


required properties:

- compatible: Should be "atmel,<chip>-sfr", "syscon".

  <chip> can be "sama5d3" or "sama5d4".

  <chip> can be "sama5d3", "sama5d4" or "sama5d2".

- reg: Should contain registers location and length



	sfr@f0038000 {

arch/arm/boot/dts/sama5d2.dtsi

+36 −0
Original line number Diff line number Diff line
@@ -319,6 +319,32 @@ 
			#size-cells = <1>;

			ranges;



			hlcdc: hlcdc@f0000000 {

				compatible = "atmel,sama5d2-hlcdc";

				reg = <0xf0000000 0x2000>;

				interrupts = <45 IRQ_TYPE_LEVEL_HIGH 0>;

				clocks = <&lcdc_clk>, <&lcdck>, <&clk32k>;

				clock-names = "periph_clk","sys_clk", "slow_clk";

				status = "disabled";



				hlcdc-display-controller {

					compatible = "atmel,hlcdc-display-controller";

					#address-cells = <1>;

					#size-cells = <0>;



					port@0 {

						#address-cells = <1>;

						#size-cells = <0>;

						reg = <0>;

					};

				};



				hlcdc_pwm: hlcdc-pwm {

					compatible = "atmel,hlcdc-pwm";

					#pwm-cells = <3>;

				};

			};



			ramc0: ramc@f000c000 {

				compatible = "atmel,sama5d3-ddramc";

				reg = <0xf000c000 0x200>;
@@ -973,6 +999,11 @@ 
				status = "disabled";

			};



			sfr: sfr@f8030000 {

				compatible = "atmel,sama5d2-sfr", "syscon";

				reg = <0xf8030000 0x98>;

			};



			flx0: flexcom@f8034000 {

				compatible = "atmel,sama5d2-flexcom";

				reg = <0xf8034000 0x200>;
@@ -1193,6 +1224,11 @@ 
				clock-names = "tdes_clk";

				status = "okay";

			};



			chipid@fc069000 {

				compatible = "atmel,sama5d2-chipid";

				reg = <0xfc069000 0x8>;

			};

		};

	};

};

include/soc/at91/atmel-sfr.h

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

 * Atmel SFR (Special Function Registers) register offsets and bit definitions.

 *

 * Copyright (C) 2016 Atmel

 *

 * Author: Ludovic Desroches <ludovic.desroches@atmel.com>

 *

 * 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.

 */



#ifndef _LINUX_MFD_SYSCON_ATMEL_SFR_H

#define _LINUX_MFD_SYSCON_ATMEL_SFR_H



#define AT91_SFR_I2SCLKSEL	0x90	/* I2SC Register */



#endif /* _LINUX_MFD_SYSCON_ATMEL_SFR_H */