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

Commit ab2dc844 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-4.20-soc' of... 

Merge tag 'tegra-for-4.20-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers

soc/tegra: Changes for v4.20-rc1

This contains a pinctrl implementation for the pad configuration that
can be controlled from the PMC.

* tag 'tegra-for-4.20-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux

:
  soc/tegra: pmc: Implement pad configuration via pinctrl
  soc/tegra: pmc: Remove public pad voltage APIs
  soc/tegra: pmc: Use X macro to generate IO pad tables
  soc/tegra: pmc: Implement tegra_io_pad_is_powered()
  soc/tegra: pmc: Factor out DPD register bit calculation
  soc/tegra: pmc: Fix pad voltage configuration for Tegra186
  soc/tegra: pmc: Fix child-node lookup
  dt-bindings: Add Tegra PMC pad configuration bindings

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ba61ab1a 4a37f11c

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

+93 −0
Original line number Diff line number Diff line
@@ -34,3 +34,96 @@ Board DTS: 
	pmc@c360000 {

		nvidia,invert-interrupt;

	};



== Pad Control ==



On Tegra SoCs a pad is a set of pins which are configured as a group.

The pin grouping is a fixed attribute of the hardware. The PMC can be

used to set pad power state and signaling voltage. A pad can be either

in active or power down mode. The support for power state and signaling

voltage configuration varies depending on the pad in question. 3.3 V and

1.8 V signaling voltages are supported on pins where software

controllable signaling voltage switching is available.



Pad configurations are described with pin configuration nodes which

are placed under the pmc node and they are referred to by the pinctrl

client properties. For more information see

Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt.



The following pads are present on Tegra186:

csia		csib		dsi		mipi-bias

pex-clk-bias	pex-clk3	pex-clk2	pex-clk1

usb0		usb1		usb2		usb-bias

uart		audio		hsic		dbg

hdmi-dp0	hdmi-dp1	pex-cntrl	sdmmc2-hv

sdmmc4		cam		dsib		dsic

dsid		csic		csid		csie

dsif		spi		ufs		dmic-hv

edp		sdmmc1-hv	sdmmc3-hv	conn

audio-hv	ao-hv



Required pin configuration properties:

  - pins: A list of strings, each of which contains the name of a pad

	  to be configured.



Optional pin configuration properties:

  - low-power-enable: Configure the pad into power down mode

  - low-power-disable: Configure the pad into active mode

  - power-source: Must contain either TEGRA_IO_PAD_VOLTAGE_1V8 or

    TEGRA_IO_PAD_VOLTAGE_3V3 to select between signaling voltages.

    The values are defined in

    include/dt-bindings/pinctrl/pinctrl-tegra-io-pad.h.



Note: The power state can be configured on all of the above pads except

      for ao-hv. Following pads have software configurable signaling

      voltages: sdmmc2-hv, dmic-hv, sdmmc1-hv, sdmmc3-hv, audio-hv,

      ao-hv.



Pad configuration state example:

	pmc: pmc@7000e400 {

		compatible = "nvidia,tegra186-pmc";

		reg = <0 0x0c360000 0 0x10000>,

		      <0 0x0c370000 0 0x10000>,

		      <0 0x0c380000 0 0x10000>,

		      <0 0x0c390000 0 0x10000>;

		reg-names = "pmc", "wake", "aotag", "scratch";



		...



		sdmmc1_3v3: sdmmc1-3v3 {

			pins = "sdmmc1-hv";

			power-source = <TEGRA_IO_PAD_VOLTAGE_3V3>;

		};



		sdmmc1_1v8: sdmmc1-1v8 {

			pins = "sdmmc1-hv";

			power-source = <TEGRA_IO_PAD_VOLTAGE_1V8>;

		};



		hdmi_off: hdmi-off {

			pins = "hdmi";

			low-power-enable;

		}



		hdmi_on: hdmi-on {

			pins = "hdmi";

			low-power-disable;

		}

	};



Pinctrl client example:

	sdmmc1: sdhci@3400000 {

		...

		pinctrl-names = "sdmmc-3v3", "sdmmc-1v8";

		pinctrl-0 = <&sdmmc1_3v3>;

		pinctrl-1 = <&sdmmc1_1v8>;

	};



	...



	sor0: sor@15540000 {

		...

		pinctrl-0 = <&hdmi_off>;

		pinctrl-1 = <&hdmi_on>;

		pinctrl-names = "hdmi-on", "hdmi-off";

	};

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

+103 −0
Original line number Diff line number Diff line
@@ -195,3 +195,106 @@ Example: 
		power-domains = <&pd_audio>;

		...

	};



== Pad Control ==



On Tegra SoCs a pad is a set of pins which are configured as a group.

The pin grouping is a fixed attribute of the hardware. The PMC can be

used to set pad power state and signaling voltage. A pad can be either

in active or power down mode. The support for power state and signaling

voltage configuration varies depending on the pad in question. 3.3 V and

1.8 V signaling voltages are supported on pins where software

controllable signaling voltage switching is available.



The pad configuration state nodes are placed under the pmc node and they

are referred to by the pinctrl client properties. For more information

see Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt.

The pad name should be used as the value of the pins property in pin

configuration nodes.



The following pads are present on Tegra124 and Tegra132:

audio		bb		cam		comp

csia		csb		cse		dsi

dsib		dsic		dsid		hdmi

hsic		hv		lvds		mipi-bias

nand		pex-bias	pex-clk1	pex-clk2

pex-cntrl	sdmmc1		sdmmc3		sdmmc4

sys_ddc		uart		usb0		usb1

usb2		usb_bias



The following pads are present on Tegra210:

audio		audio-hv	cam		csia

csib		csic		csid		csie

csif		dbg		debug-nonao	dmic

dp		dsi		dsib		dsic

dsid		emmc		emmc2		gpio

hdmi		hsic		lvds		mipi-bias

pex-bias	pex-clk1	pex-clk2	pex-cntrl

sdmmc1		sdmmc3		spi		spi-hv

uart		usb0		usb1		usb2

usb3		usb-bias



Required pin configuration properties:

  - pins: Must contain name of the pad(s) to be configured.



Optional pin configuration properties:

  - low-power-enable: Configure the pad into power down mode

  - low-power-disable: Configure the pad into active mode

  - power-source: Must contain either TEGRA_IO_PAD_VOLTAGE_1V8

    or TEGRA_IO_PAD_VOLTAGE_3V3 to select between signaling voltages.

    The values are defined in

    include/dt-bindings/pinctrl/pinctrl-tegra-io-pad.h.



Note: The power state can be configured on all of the Tegra124 and

      Tegra132 pads. None of the Tegra124 or Tegra132 pads support

      signaling voltage switching.



Note: All of the listed Tegra210 pads except pex-cntrl support power

      state configuration. Signaling voltage switching is supported on

      following Tegra210 pads: audio, audio-hv, cam, dbg, dmic, gpio,

      pex-cntrl, sdmmc1, sdmmc3, spi, spi-hv, and uart.



Pad configuration state example:

	pmc: pmc@7000e400 {

		compatible = "nvidia,tegra210-pmc";

		reg = <0x0 0x7000e400 0x0 0x400>;

		clocks = <&tegra_car TEGRA210_CLK_PCLK>, <&clk32k_in>;

		clock-names = "pclk", "clk32k_in";



		...



		sdmmc1_3v3: sdmmc1-3v3 {

			pins = "sdmmc1";

			power-source = <TEGRA_IO_PAD_VOLTAGE_3V3>;

		};



		sdmmc1_1v8: sdmmc1-1v8 {

			pins = "sdmmc1";

			power-source = <TEGRA_IO_PAD_VOLTAGE_1V8>;

		};



		hdmi_off: hdmi-off {

			pins = "hdmi";

			low-power-enable;

		}



		hdmi_on: hdmi-on {

			pins = "hdmi";

			low-power-disable;

		}

	};



Pinctrl client example:

	sdmmc1: sdhci@700b0000 {

		...

		pinctrl-names = "sdmmc-3v3", "sdmmc-1v8";

		pinctrl-0 = <&sdmmc1_3v3>;

		pinctrl-1 = <&sdmmc1_1v8>;

	};

	...

	sor@54540000 {

		...

		pinctrl-0 = <&hdmi_off>;

		pinctrl-1 = <&hdmi_on>;

		pinctrl-names = "hdmi-on", "hdmi-off";

	};

drivers/soc/tegra/pmc.c

+384 −129

File changed.

Preview size limit exceeded, changes collapsed.

include/dt-bindings/pinctrl/pinctrl-tegra-io-pad.h

0 → 100644
+18 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * pinctrl-tegra-io-pad.h: Tegra I/O pad source voltage configuration constants

 * pinctrl bindings.

 *

 * Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.

 *

 * Author: Aapo Vienamo <avienamo@nvidia.com>

 */



#ifndef _DT_BINDINGS_PINCTRL_TEGRA_IO_PAD_H

#define _DT_BINDINGS_PINCTRL_TEGRA_IO_PAD_H



/* Voltage levels of the I/O pad's source rail */

#define TEGRA_IO_PAD_VOLTAGE_1V8	0

#define TEGRA_IO_PAD_VOLTAGE_3V3	1



#endif

include/soc/tegra/pmc.h

+1 −19
Original line number Diff line number Diff line
@@ -134,22 +134,13 @@ enum tegra_io_pad { 
	TEGRA_IO_PAD_USB2,

	TEGRA_IO_PAD_USB3,

	TEGRA_IO_PAD_USB_BIAS,

	TEGRA_IO_PAD_AO_HV,

};



/* deprecated, use TEGRA_IO_PAD_{HDMI,LVDS} instead */

#define TEGRA_IO_RAIL_HDMI	TEGRA_IO_PAD_HDMI

#define TEGRA_IO_RAIL_LVDS	TEGRA_IO_PAD_LVDS



/**

 * enum tegra_io_pad_voltage - voltage level of the I/O pad's source rail

 * @TEGRA_IO_PAD_1800000UV: 1.8 V

 * @TEGRA_IO_PAD_3300000UV: 3.3 V

 */

enum tegra_io_pad_voltage {

	TEGRA_IO_PAD_1800000UV,

	TEGRA_IO_PAD_3300000UV,

};



#ifdef CONFIG_SOC_TEGRA_PMC

int tegra_powergate_is_powered(unsigned int id);

int tegra_powergate_power_on(unsigned int id);
@@ -162,9 +153,6 @@ int tegra_powergate_sequence_power_up(unsigned int id, struct clk *clk, 


int tegra_io_pad_power_enable(enum tegra_io_pad id);

int tegra_io_pad_power_disable(enum tegra_io_pad id);

int tegra_io_pad_set_voltage(enum tegra_io_pad id,

			     enum tegra_io_pad_voltage voltage);

int tegra_io_pad_get_voltage(enum tegra_io_pad id);



/* deprecated, use tegra_io_pad_power_{enable,disable}() instead */

int tegra_io_rail_power_on(unsigned int id);
@@ -212,12 +200,6 @@ static inline int tegra_io_pad_power_disable(enum tegra_io_pad id) 
	return -ENOSYS;

}



static inline int tegra_io_pad_set_voltage(enum tegra_io_pad id,

					   enum tegra_io_pad_voltage voltage)

{

	return -ENOSYS;

}



static inline int tegra_io_pad_get_voltage(enum tegra_io_pad id)

{

	return -ENOSYS;