Commit 9c0cc578 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-3.7-cleanup2' of... 

Merge tag 'tegra-for-3.7-cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup2

ARM: tegra: second round of cleanups

This branch mainly removes dead code following the removal of all board
files. The removals depend on various changes in other branches, so they
are all merged together and form the basis of this branch, as enumerated
below.

Finally, there are no remaining users of pinconf-tegra.h outside the
pinctrl subsystem, so that header is incorporated into an existing file
there. This reduces the number of headers in mach-tegra/include, and so
helps move towards single zImage.

This branch is based on tegra-for-3.7-cleanup, followed by a merge of
tegra-for-3.7-board-removal, followed by a merge of
tegra-for-3.7-common-clk, followed by a merge of:

git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git xceiv-for-v3.7

By Stephen Warren (16) and others
via Stephen Warren
* tag 'tegra-for-3.7-cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: (29 commits)
  pinctrl: tegra: move pinconf-tegra.h content into drivers/pinctrl
  ARM: tegra: delete unused headers
  ARM: tegra: remove useless includes of <mach/*.h>
  ARM: tegra: remove dead code
  ARM: dt: tegra: harmony: configure power off
  ARM: dt: tegra: harmony: add regulators
  ARM: tegra: remove board (but not DT) support for Harmony
  ARM: tegra: remove board (but not DT) support for Paz00
  ARM: tegra: remove board (but not DT) support for TrimSlice
  ARM: Tegra: Add smp_twd clock for Tegra20
  ARM: tegra: cpu-tegra: explicitly manage re-parenting
  ARM: tegra: fix overflow in tegra20_pll_clk_round_rate()
  ARM: tegra: Fix data type for io address
  ARM: tegra: remove tegra_timer from tegra_list_clks
  ARM: tegra30: clocks: fix the wrong tegra_audio_sync_clk_ops name
  ARM: tegra: clocks: separate tegra_clk_32k_ops from Tegra20 and Tegra30
  ARM: tegra: Remove duplicate code
  ARM: tegra: Port tegra to generic clock framework
  ARM: tegra: Add clk_tegra structure and helper functions
  ARM: tegra: Rename tegra20 clock file
  ...
parents 36f926cf 3b2f9412

Documentation/devicetree/bindings/regulator/tps6586x.txt

+39 −26
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ Required properties: 
- gpio-controller: mark the device as a GPIO controller

- regulators: list of regulators provided by this controller, must have

  property "regulator-compatible" to match their hardware counterparts:

  sm[0-2], ldo[0-9] and ldo_rtc

  sys, sm[0-2], ldo[0-9] and ldo_rtc

- sys-supply: The input supply for SYS.

- vin-sm0-supply: The input supply for the SM0.

- vin-sm1-supply: The input supply for the SM1.

- vin-sm2-supply: The input supply for the SM2.
@@ -20,6 +21,9 @@ Required properties: 


Each regulator is defined using the standard binding for regulators.



Note: LDO5 and LDO_RTC is supplied by SYS regulator internally and driver

      take care of making proper parent child relationship.



Example:



	pmu: tps6586x@34 {
@@ -30,6 +34,7 @@ Example: 
		#gpio-cells = <2>;

		gpio-controller;



		sys-supply = <&some_reg>;

		vin-sm0-supply = <&some_reg>;

		vin-sm1-supply = <&some_reg>;

		vin-sm2-supply = <&some_reg>;
@@ -43,8 +48,16 @@ Example: 
			#address-cells = <1>;

			#size-cells = <0>;



			sm0_reg: regulator@0 {

			sys_reg: regulator@0 {

				reg = <0>;

				regulator-compatible = "sys";

				regulator-name = "vdd_sys";

				regulator-boot-on;

				regulator-always-on;

			};



			sm0_reg: regulator@1 {

				reg = <1>;

				regulator-compatible = "sm0";

				regulator-min-microvolt = < 725000>;

				regulator-max-microvolt = <1500000>;
@@ -52,8 +65,8 @@ Example: 
				regulator-always-on;

			};



			sm1_reg: regulator@1 {

				reg = <1>;

			sm1_reg: regulator@2 {

				reg = <2>;

				regulator-compatible = "sm1";

				regulator-min-microvolt = < 725000>;

				regulator-max-microvolt = <1500000>;
@@ -61,8 +74,8 @@ Example: 
				regulator-always-on;

			};



			sm2_reg: regulator@2 {

				reg = <2>;

			sm2_reg: regulator@3 {

				reg = <3>;

				regulator-compatible = "sm2";

				regulator-min-microvolt = <3000000>;

				regulator-max-microvolt = <4550000>;
@@ -70,72 +83,72 @@ Example: 
				regulator-always-on;

			};



			ldo0_reg: regulator@3 {

				reg = <3>;

			ldo0_reg: regulator@4 {

				reg = <4>;

				regulator-compatible = "ldo0";

				regulator-name = "PCIE CLK";

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

			};



			ldo1_reg: regulator@4 {

				reg = <4>;

			ldo1_reg: regulator@5 {

				reg = <5>;

				regulator-compatible = "ldo1";

				regulator-min-microvolt = < 725000>;

				regulator-max-microvolt = <1500000>;

			};



			ldo2_reg: regulator@5 {

				reg = <5>;

			ldo2_reg: regulator@6 {

				reg = <6>;

				regulator-compatible = "ldo2";

				regulator-min-microvolt = < 725000>;

				regulator-max-microvolt = <1500000>;

			};



			ldo3_reg: regulator@6 {

				reg = <6>;

			ldo3_reg: regulator@7 {

				reg = <7>;

				regulator-compatible = "ldo3";

				regulator-min-microvolt = <1250000>;

				regulator-max-microvolt = <3300000>;

			};



			ldo4_reg: regulator@7 {

				reg = <7>;

			ldo4_reg: regulator@8 {

				reg = <8>;

				regulator-compatible = "ldo4";

				regulator-min-microvolt = <1700000>;

				regulator-max-microvolt = <2475000>;

			};



			ldo5_reg: regulator@8 {

				reg = <8>;

			ldo5_reg: regulator@9 {

				reg = <9>;

				regulator-compatible = "ldo5";

				regulator-min-microvolt = <1250000>;

				regulator-max-microvolt = <3300000>;

			};



			ldo6_reg: regulator@9 {

				reg = <9>;

			ldo6_reg: regulator@10 {

				reg = <10>;

				regulator-compatible = "ldo6";

				regulator-min-microvolt = <1250000>;

				regulator-max-microvolt = <3300000>;

			};



			ldo7_reg: regulator@10 {

				reg = <10>;

			ldo7_reg: regulator@11 {

				reg = <11>;

				regulator-compatible = "ldo7";

				regulator-min-microvolt = <1250000>;

				regulator-max-microvolt = <3300000>;

			};



			ldo8_reg: regulator@11 {

				reg = <11>;

			ldo8_reg: regulator@12 {

				reg = <12>;

				regulator-compatible = "ldo8";

				regulator-min-microvolt = <1250000>;

				regulator-max-microvolt = <3300000>;

			};



			ldo9_reg: regulator@12 {

				reg = <12>;

			ldo9_reg: regulator@13 {

				reg = <13>;

				regulator-compatible = "ldo9";

				regulator-min-microvolt = <1250000>;

				regulator-max-microvolt = <3300000>;

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -686,6 +686,7 @@ config ARCH_TEGRA 
	select NEED_MACH_IO_H if PCI

	select ARCH_HAS_CPUFREQ

	select USE_OF

	select COMMON_CLK

	help

	  This enables support for NVIDIA Tegra based systems (Tegra APX,

	  Tegra 6xx and Tegra 2 series).

arch/arm/boot/dts/tegra20-harmony.dts

+220 −0
Original line number Diff line number Diff line
@@ -275,6 +275,160 @@ 
	i2c@7000d000 {

		status = "okay";

		clock-frequency = <400000>;



		pmic: tps6586x@34 {

			compatible = "ti,tps6586x";

			reg = <0x34>;

			interrupts = <0 86 0x4>;



			ti,system-power-controller;



			#gpio-cells = <2>;

			gpio-controller;



			sys-supply = <&vdd_5v0_reg>;

			vin-sm0-supply = <&sys_reg>;

			vin-sm1-supply = <&sys_reg>;

			vin-sm2-supply = <&sys_reg>;

			vinldo01-supply = <&sm2_reg>;

			vinldo23-supply = <&sm2_reg>;

			vinldo4-supply = <&sm2_reg>;

			vinldo678-supply = <&sm2_reg>;

			vinldo9-supply = <&sm2_reg>;



			regulators {

				#address-cells = <1>;

				#size-cells = <0>;



				sys_reg: regulator@0 {

					reg = <0>;

					regulator-compatible = "sys";

					regulator-name = "vdd_sys";

					regulator-always-on;

				};



				regulator@1 {

					reg = <1>;

					regulator-compatible = "sm0";

					regulator-name = "vdd_sm0,vdd_core";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

					regulator-always-on;

				};



				regulator@2 {

					reg = <2>;

					regulator-compatible = "sm1";

					regulator-name = "vdd_sm1,vdd_cpu";

					regulator-min-microvolt = <1000000>;

					regulator-max-microvolt = <1000000>;

					regulator-always-on;

				};



				sm2_reg: regulator@3 {

					reg = <3>;

					regulator-compatible = "sm2";

					regulator-name = "vdd_sm2,vin_ldo*";

					regulator-min-microvolt = <3700000>;

					regulator-max-microvolt = <3700000>;

					regulator-always-on;

				};



				regulator@4 {

					reg = <4>;

					regulator-compatible = "ldo0";

					regulator-name = "vdd_ldo0,vddio_pex_clk";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

				};



				regulator@5 {

					reg = <5>;

					regulator-compatible = "ldo1";

					regulator-name = "vdd_ldo1,avdd_pll*";

					regulator-min-microvolt = <1100000>;

					regulator-max-microvolt = <1100000>;

					regulator-always-on;

				};



				regulator@6 {

					reg = <6>;

					regulator-compatible = "ldo2";

					regulator-name = "vdd_ldo2,vdd_rtc";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

				};



				regulator@7 {

					reg = <7>;

					regulator-compatible = "ldo3";

					regulator-name = "vdd_ldo3,avdd_usb*";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

					regulator-always-on;

				};



				regulator@8 {

					reg = <8>;

					regulator-compatible = "ldo4";

					regulator-name = "vdd_ldo4,avdd_osc,vddio_sys";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-always-on;

				};



				regulator@9 {

					reg = <9>;

					regulator-compatible = "ldo5";

					regulator-name = "vdd_ldo5,vcore_mmc";

					regulator-min-microvolt = <2850000>;

					regulator-max-microvolt = <2850000>;

					regulator-always-on;

				};



				regulator@10 {

					reg = <10>;

					regulator-compatible = "ldo6";

					regulator-name = "vdd_ldo6,avdd_vdac";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};



				regulator@11 {

					reg = <11>;

					regulator-compatible = "ldo7";

					regulator-name = "vdd_ldo7,avdd_hdmi,vdd_fuse";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

				};



				regulator@12 {

					reg = <12>;

					regulator-compatible = "ldo8";

					regulator-name = "vdd_ldo8,avdd_hdmi_pll";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};



				regulator@13 {

					reg = <13>;

					regulator-compatible = "ldo9";

					regulator-name = "vdd_ldo9,avdd_2v85,vdd_ddr_rx";

					regulator-min-microvolt = <2850000>;

					regulator-max-microvolt = <2850000>;

					regulator-always-on;

				};



				regulator@14 {

					reg = <14>;

					regulator-compatible = "ldo_rtc";

					regulator-name = "vdd_rtc_out,vdd_cell";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

					regulator-always-on;

				};

			};

		};

	};



	pmc {
@@ -310,6 +464,72 @@ 
		bus-width = <8>;

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		vdd_5v0_reg: regulator@0 {

			compatible = "regulator-fixed";

			reg = <0>;

			regulator-name = "vdd_5v0";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			regulator-always-on;

		};



		regulator@1 {

			compatible = "regulator-fixed";

			reg = <1>;

			regulator-name = "vdd_1v5";

			regulator-min-microvolt = <1500000>;

			regulator-max-microvolt = <1500000>;

			gpio = <&pmic 0 0>;

		};



		regulator@2 {

			compatible = "regulator-fixed";

			reg = <2>;

			regulator-name = "vdd_1v2";

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1200000>;

			gpio = <&pmic 1 0>;

			enable-active-high;

		};



		regulator@3 {

			compatible = "regulator-fixed";

			reg = <3>;

			regulator-name = "vdd_1v05";

			regulator-min-microvolt = <1050000>;

			regulator-max-microvolt = <1050000>;

			gpio = <&pmic 2 0>;

			enable-active-high;

			/* Hack until board-harmony-pcie.c is removed */

			status = "disabled";

		};



		regulator@4 {

			compatible = "regulator-fixed";

			reg = <4>;

			regulator-name = "vdd_pnl";

			regulator-min-microvolt = <2800000>;

			regulator-max-microvolt = <2800000>;

			gpio = <&gpio 22 0>; /* gpio PC6 */

			enable-active-high;

		};



		regulator@5 {

			compatible = "regulator-fixed";

			reg = <5>;

			regulator-name = "vdd_bl";

			regulator-min-microvolt = <2800000>;

			regulator-max-microvolt = <2800000>;

			gpio = <&gpio 176 0>; /* gpio PW0 */

			enable-active-high;

		};

	};



	sound {

		compatible = "nvidia,tegra-audio-wm8903-harmony",

			     "nvidia,tegra-audio-wm8903";

arch/arm/mach-tegra/Kconfig

+0 −20
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ config ARCH_TEGRA_3x_SOC 
	select USB_ARCH_HAS_EHCI if USB_SUPPORT

	select USB_ULPI if USB

	select USB_ULPI_VIEWPORT if USB_SUPPORT

	select USE_OF

	select ARM_ERRATA_743622

	select ARM_ERRATA_751472

	select ARM_ERRATA_754322
@@ -60,25 +59,6 @@ config TEGRA_AHB 


comment "Tegra board type"



config MACH_HARMONY

       bool "Harmony board"

       depends on ARCH_TEGRA_2x_SOC

       help

         Support for nVidia Harmony development platform



config MACH_PAZ00

       bool "Paz00 board"

       depends on ARCH_TEGRA_2x_SOC

       help

         Support for the Toshiba AC100/Dynabook AZ netbook



config MACH_TRIMSLICE

       bool "TrimSlice board"

       depends on ARCH_TEGRA_2x_SOC

       select TEGRA_PCI

       help

         Support for CompuLab TrimSlice platform



choice

        prompt "Default low-level debug console UART"

        default TEGRA_DEBUG_UART_NONE

arch/arm/mach-tegra/Makefile

+5 −12
Original line number Diff line number Diff line 
obj-y                                   += board-pinmux.o

obj-y                                   += common.o

obj-y                                   += devices.o

obj-y                                   += io.o

obj-y                                   += irq.o

obj-y                                   += clock.o
@@ -12,9 +10,11 @@ obj-y += powergate.o 
obj-y					+= apbio.o

obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o

obj-$(CONFIG_CPU_IDLE)			+= sleep.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra2_clocks.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra20_clocks.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra20_clocks_data.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= tegra2_emc.o

obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= tegra30_clocks.o

obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= tegra30_clocks_data.o

obj-$(CONFIG_SMP)			+= platsmp.o headsmp.o

obj-$(CONFIG_SMP)                       += reset.o

obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o
@@ -25,13 +25,6 @@ obj-$(CONFIG_TEGRA_PCI) += pcie.o 
obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= board-dt-tegra20.o

obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= board-dt-tegra30.o



obj-$(CONFIG_MACH_HARMONY)              += board-harmony.o

obj-$(CONFIG_MACH_HARMONY)              += board-harmony-pinmux.o

obj-$(CONFIG_MACH_HARMONY)              += board-harmony-pcie.o

obj-$(CONFIG_MACH_HARMONY)              += board-harmony-power.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= board-harmony-pcie.o



obj-$(CONFIG_MACH_PAZ00)		+= board-paz00.o

obj-$(CONFIG_MACH_PAZ00)		+= board-paz00-pinmux.o



obj-$(CONFIG_MACH_TRIMSLICE)            += board-trimslice.o

obj-$(CONFIG_MACH_TRIMSLICE)            += board-trimslice-pinmux.o
 
obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= board-paz00.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE