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

Commit 34800598 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 



Pull "ARM: driver specific updates" from Arnd Bergmann:
 "These are all specific to some driver.  They are typically the
  platform side of a change in the drivers directory, such as adding a
  new driver or extending the interface to the platform.  In cases where
  there is no maintainer for the driver, or the maintainer prefers to
  have the platform changes in the same branch as the driver changes,
  the patches to the drivers are included as well.

  A much smaller set of driver updates that depend on other branches
  getting merged first will be sent later.

  The new export of tegra_chip_uid conflicts with other changes in
  fuse.c.  In rtc-sa1100.c, the global removal of IRQF_DISABLED
  conflicts with the cleanup of the interrupt handling of that driver.

  Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de&gt;">

Fixed up aforementioned trivial conflicts.

* tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)
  ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci
  mmc: sdhci-s3c: add platform data for the second capability
  ARM: SAMSUNG: support the second capability for samsung-soc
  ARM: EXYNOS: add support DMA for EXYNOS4X12 SoC
  ARM: EXYNOS: Add apb_pclk clkdev entry for mdma1
  ARM: EXYNOS: Enable MDMA driver
  regulator: Remove bq24022 regulator driver
  rtc: sa1100: add OF support
  pxa: magician/hx4700: Convert to gpio-regulator from bq24022
  ARM: OMAP3+: SmartReflex: fix error handling
  ARM: OMAP3+: SmartReflex: fix the use of debugfs_create_* API
  ARM: OMAP3+: SmartReflex: micro-optimization for sanity check
  ARM: OMAP3+: SmartReflex: misc cleanups
  ARM: OMAP3+: SmartReflex: move late_initcall() closer to its argument
  ARM: OMAP3+: SmartReflex: add missing platform_set_drvdata()
  ARM: OMAP3+: hwmod: add SmartReflex IRQs
  ARM: OMAP3+: SmartReflex: clear ERRCONFIG_VPBOUNDINTST only on a need
  ARM: OMAP3+: SmartReflex: Fix status masking in ERRCONFIG register
  ARM: OMAP3+: SmartReflex: Add a shutdown hook
  ARM: OMAP3+: SmartReflex Class3: disable errorgen before disable VP
  ...

Conflicts:
	arch/arm/mach-tegra/Makefile
	arch/arm/mach-tegra/fuse.c
	drivers/rtc/rtc-sa1100.c
parents 46b407ca 511f1cb6

Documentation/devicetree/bindings/arm/tegra/emc.txt

0 → 100644
+100 −0
Original line number Original line Diff line number Diff line 
Embedded Memory Controller



Properties:

- name : Should be emc

- #address-cells : Should be 1

- #size-cells : Should be 0

- compatible : Should contain "nvidia,tegra20-emc".

- reg : Offset and length of the register set for the device

- nvidia,use-ram-code : If present, the sub-nodes will be addressed

  and chosen using the ramcode board selector. If omitted, only one

  set of tables can be present and said tables will be used

  irrespective of ram-code configuration.



Child device nodes describe the memory settings for different configurations and clock rates.



Example:



	emc@7000f400 {

		#address-cells = < 1 >;

		#size-cells = < 0 >;

		compatible = "nvidia,tegra20-emc";

		reg = <0x7000f4000 0x200>;

	}





Embedded Memory Controller ram-code table



If the emc node has the nvidia,use-ram-code property present, then the

next level of nodes below the emc table are used to specify which settings

apply for which ram-code settings.



If the emc node lacks the nvidia,use-ram-code property, this level is omitted

and the tables are stored directly under the emc node (see below).



Properties:



- name : Should be emc-tables

- nvidia,ram-code : the binary representation of the ram-code board strappings

  for which this node (and children) are valid.







Embedded Memory Controller configuration table



This is a table containing the EMC register settings for the various

operating speeds of the memory controller. They are always located as

subnodes of the emc controller node.



There are two ways of specifying which tables to use:



* The simplest is if there is just one set of tables in the device tree,

  and they will always be used (based on which frequency is used).

  This is the preferred method, especially when firmware can fill in

  this information based on the specific system information and just

  pass it on to the kernel.



* The slightly more complex one is when more than one memory configuration

  might exist on the system.  The Tegra20 platform handles this during

  early boot by selecting one out of possible 4 memory settings based

  on a 2-pin "ram code" bootstrap setting on the board. The values of

  these strappings can be read through a register in the SoC, and thus

  used to select which tables to use.



Properties:

- name : Should be emc-table

- compatible : Should contain "nvidia,tegra20-emc-table".

- reg : either an opaque enumerator to tell different tables apart, or

  the valid frequency for which the table should be used (in kHz).

- clock-frequency : the clock frequency for the EMC at which this

  table should be used (in kHz).

- nvidia,emc-registers : a 46 word array of EMC registers to be programmed

  for operation at the 'clock-frequency' setting.

  The order and contents of the registers are:

    RC, RFC, RAS, RP, R2W, W2R, R2P, W2P, RD_RCD, WR_RCD, RRD, REXT,

    WDV, QUSE, QRST, QSAFE, RDV, REFRESH, BURST_REFRESH_NUM, PDEX2WR,

    PDEX2RD, PCHG2PDEN, ACT2PDEN, AR2PDEN, RW2PDEN, TXSR, TCKE, TFAW,

    TRPAB, TCLKSTABLE, TCLKSTOP, TREFBW, QUSE_EXTRA, FBIO_CFG6, ODT_WRITE,

    ODT_READ, FBIO_CFG5, CFG_DIG_DLL, DLL_XFORM_DQS, DLL_XFORM_QUSE,

    ZCAL_REF_CNT, ZCAL_WAIT_CNT, AUTO_CAL_INTERVAL, CFG_CLKTRIM_0,

    CFG_CLKTRIM_1, CFG_CLKTRIM_2



		emc-table@166000 {

			reg = <166000>;

			compatible = "nvidia,tegra20-emc-table";

			clock-frequency = < 166000 >;

			nvidia,emc-registers = < 0 0 0 0 0 0 0 0 0 0 0 0 0 0

						 0 0 0 0 0 0 0 0 0 0 0 0 0 0

						 0 0 0 0 0 0 0 0 0 0 0 0 0 0

						 0 0 0 0 >;

		};



		emc-table@333000 {

			reg = <333000>;

			compatible = "nvidia,tegra20-emc-table";

			clock-frequency = < 333000 >;

			nvidia,emc-registers = < 0 0 0 0 0 0 0 0 0 0 0 0 0 0

						 0 0 0 0 0 0 0 0 0 0 0 0 0 0

						 0 0 0 0 0 0 0 0 0 0 0 0 0 0

						 0 0 0 0 >;

		};

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.txt

0 → 100644
+19 −0
Original line number Original line Diff line number Diff line 
NVIDIA Tegra Power Management Controller (PMC)



Properties:

- name : Should be pmc

- compatible : Should contain "nvidia,tegra<chip>-pmc".

- reg : Offset and length of the register set for the device

- nvidia,invert-interrupt : If present, inverts the PMU interrupt signal.

  The PMU is an external Power Management Unit, whose interrupt output

  signal is fed into the PMC. This signal is optionally inverted, and then

  fed into the ARM GIC. The PMC is not involved in the detection or

  handling of this interrupt signal, merely its inversion.



Example:



pmc@7000f400 {

	compatible = "nvidia,tegra20-pmc";

	reg = <0x7000e400 0x400>;

	nvidia,invert-interrupt;

};

Documentation/devicetree/bindings/dma/tegra20-apbdma.txt

0 → 100644
+30 −0
Original line number Original line Diff line number Diff line 
* NVIDIA Tegra APB DMA controller



Required properties:

- compatible: Should be "nvidia,<chip>-apbdma"

- reg: Should contain DMA registers location and length. This shuld include

  all of the per-channel registers.

- interrupts: Should contain all of the per-channel DMA interrupts.



Examples:



apbdma: dma@6000a000 {

	compatible = "nvidia,tegra20-apbdma";

	reg = <0x6000a000 0x1200>;

	interrupts = < 0 136 0x04

		       0 137 0x04

		       0 138 0x04

		       0 139 0x04

		       0 140 0x04

		       0 141 0x04

		       0 142 0x04

		       0 143 0x04

		       0 144 0x04

		       0 145 0x04

		       0 146 0x04

		       0 147 0x04

		       0 148 0x04

		       0 149 0x04

		       0 150 0x04

		       0 151 0x04 >;

};

Documentation/devicetree/bindings/gpio/gpio_nvidia.txt

+34 −2
Original line number Original line Diff line number Diff line 
NVIDIA Tegra 2 GPIO controller

NVIDIA Tegra GPIO controller





Required properties:

Required properties:

- compatible : "nvidia,tegra20-gpio"

- compatible : "nvidia,tegra<chip>-gpio"

- reg : Physical base address and length of the controller's registers.

- interrupts : The interrupt outputs from the controller. For Tegra20,

  there should be 7 interrupts specified, and for Tegra30, there should

  be 8 interrupts specified.

- #gpio-cells : Should be two. The first cell is the pin number and the

- #gpio-cells : Should be two. The first cell is the pin number and the

  second cell is used to specify optional parameters:

  second cell is used to specify optional parameters:

  - bit 0 specifies polarity (0 for normal, 1 for inverted)

  - bit 0 specifies polarity (0 for normal, 1 for inverted)

- gpio-controller : Marks the device node as a GPIO controller.

- gpio-controller : Marks the device node as a GPIO controller.

- #interrupt-cells : Should be 2.

  The first cell is the GPIO number.

  The second cell is used to specify flags:

    bits[3:0] trigger type and level flags:

      1 = low-to-high edge triggered.

      2 = high-to-low edge triggered.

      4 = active high level-sensitive.

      8 = active low level-sensitive.

      Valid combinations are 1, 2, 3, 4, 8.

- interrupt-controller : Marks the device node as an interrupt controller.



Example:



gpio: gpio@6000d000 {

	compatible = "nvidia,tegra20-gpio";

	reg = < 0x6000d000 0x1000 >;

	interrupts = < 0 32 0x04

		       0 33 0x04

		       0 34 0x04

		       0 35 0x04

		       0 55 0x04

		       0 87 0x04

		       0 89 0x04 >;

	#gpio-cells = <2>;

	gpio-controller;

	#interrupt-cells = <2>;

	interrupt-controller;

};

arch/arm/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -760,7 +760,7 @@ config ARCH_SA1100 
	select ARCH_HAS_CPUFREQ

	select ARCH_HAS_CPUFREQ

	select CPU_FREQ

	select CPU_FREQ

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select CLKDEV_LOOKUP

	select HAVE_SCHED_CLOCK

	select HAVE_SCHED_CLOCK

	select TICK_ONESHOT

	select TICK_ONESHOT

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB