Commit 05983ed4 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/soc 

Merge "at91: cleanup for 3.16 #1" from Nicolas Ferre:

First cleanup series for 3.15
- localize GPIO header in mach-at91 directory
- big update on the CCF front with main and slow clocks
- a cleanup of ADC and touchscreen driver with unification on IIO and
  removal of old driver

[olof: Most of this branch is new code, not cleanups, so I'm merging this into
the SoC branch in spite of the branch name]

* tag 'at91-cleanup' of git://github.com/at91linux/linux-at91

: (28 commits)
  ARM: at91/dt: at91-cosino_mega2560 remove useless tsadcc node
  ARM: at91: remove atmel_tsadcc platform_data
  Input: atmel_tsadcc: remove driver
  ARM: at91: remove atmel_tsadcc from sama5_defconfig
  ARM: at91: sam9rl: switch from atmel_tsadcc to at91_adc
  ARM: at91: sam9g45: switch from atmel_tsadcc to at91_adc
  ARM: at91: sam9rlek add touchscreen support through at91_adc
  ARM: at91: sam9rl: add at91_adc to support adc and touchscreen
  iio: adc: at91: add sam9rl support
  iio: adc: at91: remove unused include from include/mach
  ARM: at91: sam9m10g45ek: Add touchscreen support through at91_adc
  iio: adc: at91_adc: Add support for touchscreens without TSMR
  iio: adc: at91: cleanup platform_data
  ARM: at91: sam9260: remove unused platform_data
  ARM: at91: sam9g45: remove unused platform_data
  ARM: at91/dt: define sam9rlek crystal frequencies
  ARM: at91/dt: move at91sam9rl SoC to the new slow/main clock models
  ARM: at91/dt: define main xtal frequency of the at91sam9261ek board
  ARM: at91/dt: move at91sam9261 SoC to the new main clock model
  ARM: at91/dt: add xtal frequencies to sama5d3 xplained board
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 0db543fa 138e8f1c

Documentation/devicetree/bindings/clock/at91-clock.txt

+119 −9
Original line number Diff line number Diff line
@@ -6,6 +6,16 @@ This binding uses the common clock binding[1]. 


Required properties:

- compatible : shall be one of the following:

	"atmel,at91sam9x5-sckc":

		at91 SCKC (Slow Clock Controller)

		This node contains the slow clock definitions.



	"atmel,at91sam9x5-clk-slow-osc":

		at91 slow oscillator



	"atmel,at91sam9x5-clk-slow-rc-osc":

		at91 internal slow RC oscillator



	"atmel,at91rm9200-pmc" or

	"atmel,at91sam9g45-pmc" or

	"atmel,at91sam9n12-pmc" or
@@ -15,8 +25,18 @@ Required properties: 
		All at91 specific clocks (clocks defined below) must be child

		node of the PMC node.



	"atmel,at91sam9x5-clk-slow" (under sckc node)

	or

	"atmel,at91sam9260-clk-slow" (under pmc node):

		at91 slow clk



	"atmel,at91rm9200-clk-main-osc"

	"atmel,at91sam9x5-clk-main-rc-osc"

		at91 main clk sources



	"atmel,at91sam9x5-clk-main"

	"atmel,at91rm9200-clk-main":

		at91 main oscillator

		at91 main clock



	"atmel,at91rm9200-clk-master" or

	"atmel,at91sam9x5-clk-master":
@@ -54,6 +74,63 @@ Required properties: 
	"atmel,at91sam9x5-clk-utmi":

		at91 utmi clock



Required properties for SCKC node:

- reg : defines the IO memory reserved for the SCKC.

- #size-cells : shall be 0 (reg is used to encode clk id).

- #address-cells : shall be 1 (reg is used to encode clk id).





For example:

	sckc: sckc@fffffe50 {

		compatible = "atmel,sama5d3-pmc";

		reg = <0xfffffe50 0x4>

		#size-cells = <0>;

		#address-cells = <1>;



		/* put at91 slow clocks here */

	};





Required properties for internal slow RC oscillator:

- #clock-cells : from common clock binding; shall be set to 0.

- clock-frequency : define the internal RC oscillator frequency.



Optional properties:

- clock-accuracy : define the internal RC oscillator accuracy.



For example:

	slow_rc_osc: slow_rc_osc {

		compatible = "atmel,at91sam9x5-clk-slow-rc-osc";

		clock-frequency = <32768>;

		clock-accuracy = <50000000>;

	};



Required properties for slow oscillator:

- #clock-cells : from common clock binding; shall be set to 0.

- clocks : shall encode the main osc source clk sources (see atmel datasheet).



Optional properties:

- atmel,osc-bypass : boolean property. Set this when a clock signal is directly

  provided on XIN.



For example:

	slow_osc: slow_osc {

		compatible = "atmel,at91rm9200-clk-slow-osc";

		#clock-cells = <0>;

		clocks = <&slow_xtal>;

	};



Required properties for slow clock:

- #clock-cells : from common clock binding; shall be set to 0.

- clocks : shall encode the slow clk sources (see atmel datasheet).



For example:

	clk32k: slck {

		compatible = "atmel,at91sam9x5-clk-slow";

		#clock-cells = <0>;

		clocks = <&slow_rc_osc &slow_osc>;

	};



Required properties for PMC node:

- reg : defines the IO memory reserved for the PMC.

- #size-cells : shall be 0 (reg is used to encode clk id).
@@ -85,24 +162,57 @@ For example: 
		/* put at91 clocks here */

	};



Required properties for main clock internal RC oscillator:

- interrupt-parent : must reference the PMC node.

- interrupts : shall be set to "<0>".

- clock-frequency : define the internal RC oscillator frequency.



Optional properties:

- clock-accuracy : define the internal RC oscillator accuracy.



For example:

	main_rc_osc: main_rc_osc {

		compatible = "atmel,at91sam9x5-clk-main-rc-osc";

		interrupt-parent = <&pmc>;

		interrupts = <0>;

		clock-frequency = <12000000>;

		clock-accuracy = <50000000>;

	};



Required properties for main clock oscillator:

- interrupt-parent : must reference the PMC node.

- interrupts : shall be set to "<0>".

- #clock-cells : from common clock binding; shall be set to 0.

- clocks : shall encode the main osc source clk sources (see atmel datasheet).



Optional properties:

- atmel,osc-bypass : boolean property. Specified if a clock signal is provided

  on XIN.



  clock signal is directly provided on XIN pin.



For example:

	main_osc: main_osc {

		compatible = "atmel,at91rm9200-clk-main-osc";

		interrupt-parent = <&pmc>;

		interrupts = <0>;

		#clock-cells = <0>;

		clocks = <&main_xtal>;

	};



Required properties for main clock:

- interrupt-parent : must reference the PMC node.

- interrupts : shall be set to "<0>".

- #clock-cells : from common clock binding; shall be set to 0.

- clocks (optional if clock-frequency is provided) : shall be the slow clock

	phandle. This clock is used to calculate the main clock rate if

	"clock-frequency" is not provided.

- clock-frequency : the main oscillator frequency.Prefer the use of

	"clock-frequency" over automatic clock rate calculation.

- clocks : shall encode the main clk sources (see atmel datasheet).



For example:

	main: mainck {

		compatible = "atmel,at91rm9200-clk-main";

		compatible = "atmel,at91sam9x5-clk-main";

		interrupt-parent = <&pmc>;

		interrupts = <0>;

		#clock-cells = <0>;

		clocks = <&ck32k>;

		clock-frequency = <18432000>;

		clocks = <&main_rc_osc &main_osc>;

	};



Required properties for master clock:

MAINTAINERS

+0 −6
Original line number Diff line number Diff line
@@ -1617,12 +1617,6 @@ S: Supported 
F:	drivers/misc/atmel_tclib.c

F:	drivers/clocksource/tcb_clksrc.c



ATMEL TSADCC DRIVER

M:	Josh Wu <josh.wu@atmel.com>

L:	linux-input@vger.kernel.org

S:	Supported

F:	drivers/input/touchscreen/atmel_tsadcc.c



ATMEL USBA UDC DRIVER

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -376,7 +376,6 @@ config ARCH_AT91 
	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select IRQ_DOMAIN

	select NEED_MACH_GPIO_H

	select NEED_MACH_IO_H if PCCARD

	select PINCTRL

	select PINCTRL_AT91 if USE_OF

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

+0 −5
Original line number Diff line number Diff line
@@ -32,11 +32,6 @@ 
				status = "okay";

			};





			tsadcc: tsadcc@f804c000 {

				status = "okay";

			};



			rtc@fffffeb0 {

				status = "okay";

			};

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

+8 −0
Original line number Diff line number Diff line
@@ -21,6 +21,14 @@ 
		reg = <0x20000000 0x10000000>;

	};



	slow_xtal {

		clock-frequency = <32768>;

	};



	main_xtal {

		clock-frequency = <12000000>;

	};



	ahb {

		apb {

			mmc0: mmc@f0000000 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE