Commit afdeeccb authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-3.7-board-removal' of... 

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

From Stephen Warren:

ARM: tegra: remove board files

This branch removes all remaining board files for Tegra; booting is
now through device tree only.

Related, the Harmony DT is augmented with regulators, since this allows
removal of board-harmony-power.c; no other boards had regulator support.
This change depends on an enhancement to the TPS6586x regulator driver,
hence the dependency mentioned below.

* tag 'tegra-for-3.7-board-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  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
parents d6530016 be972c32

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

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

	i2c@7000d000 {

		status = "okay";

		status = "okay";

		clock-frequency = <400000>;

		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 {

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

		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 {

	sound {

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

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

			     "nvidia,tegra-audio-wm8903";

			     "nvidia,tegra-audio-wm8903";

arch/arm/mach-tegra/Kconfig

+0 −19
Original line number Original line Diff line number Diff line
@@ -59,25 +59,6 @@ config TEGRA_AHB 




comment "Tegra board type"

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

choice

        prompt "Default low-level debug console UART"

        prompt "Default low-level debug console UART"

        default TEGRA_DEBUG_UART_NONE

        default TEGRA_DEBUG_UART_NONE

arch/arm/mach-tegra/Makefile

+2 −9
Original line number Original line Diff line number Diff line
@@ -26,13 +26,6 @@ obj-$(CONFIG_USB_SUPPORT) += usb_phy.o 
obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= board-dt-tegra20.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= board-dt-tegra20.o

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

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





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

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= board-harmony-pcie.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_MACH_PAZ00)		+= board-paz00.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= 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

arch/arm/mach-tegra/board-dt-tegra20.c

+4 −19
Original line number Original line Diff line number Diff line
@@ -42,7 +42,6 @@ 
#include <mach/irqs.h>

#include <mach/irqs.h>





#include "board.h"

#include "board.h"

#include "board-harmony.h"

#include "clock.h"

#include "clock.h"

#include "devices.h"

#include "devices.h"
@@ -95,54 +94,40 @@ static void __init tegra_dt_init(void) 
				tegra20_auxdata_lookup, NULL);

				tegra20_auxdata_lookup, NULL);

}

}





#ifdef CONFIG_MACH_TRIMSLICE

static void __init trimslice_init(void)

static void __init trimslice_init(void)

{

{

#ifdef CONFIG_TEGRA_PCI

	int ret;

	int ret;





	ret = tegra_pcie_init(true, true);

	ret = tegra_pcie_init(true, true);

	if (ret)

	if (ret)

		pr_err("tegra_pci_init() failed: %d\n", ret);

		pr_err("tegra_pci_init() failed: %d\n", ret);

}

#endif

#endif

}





#ifdef CONFIG_MACH_HARMONY

static void __init harmony_init(void)

static void __init harmony_init(void)

{

{

#ifdef CONFIG_TEGRA_PCI

	int ret;

	int ret;





	ret = harmony_regulator_init();

	if (ret) {

		pr_err("harmony_regulator_init() failed: %d\n", ret);

		return;

	}



	ret = harmony_pcie_init();

	ret = harmony_pcie_init();

	if (ret)

	if (ret)

		pr_err("harmony_pcie_init() failed: %d\n", ret);

		pr_err("harmony_pcie_init() failed: %d\n", ret);

}

#endif

#endif

}





#ifdef CONFIG_MACH_PAZ00

static void __init paz00_init(void)

static void __init paz00_init(void)

{

{

	tegra_paz00_wifikill_init();

	tegra_paz00_wifikill_init();

}

}

#endif





static struct {

static struct {

	char *machine;

	char *machine;

	void (*init)(void);

	void (*init)(void);

} board_init_funcs[] = {

} board_init_funcs[] = {

#ifdef CONFIG_MACH_TRIMSLICE

	{ "compulab,trimslice", trimslice_init },

	{ "compulab,trimslice", trimslice_init },

#endif

#ifdef CONFIG_MACH_HARMONY

	{ "nvidia,harmony", harmony_init },

	{ "nvidia,harmony", harmony_init },

#endif

#ifdef CONFIG_MACH_PAZ00

	{ "compal,paz00", paz00_init },

	{ "compal,paz00", paz00_init },

#endif

};

};





static void __init tegra_dt_init_late(void)

static void __init tegra_dt_init_late(void)

arch/arm/mach-tegra/board-harmony-pcie.c

+30 −19
Original line number Original line Diff line number Diff line
@@ -18,35 +18,57 @@ 
#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/gpio.h>

#include <linux/gpio.h>

#include <linux/err.h>

#include <linux/err.h>

#include <linux/of_gpio.h>

#include <linux/regulator/consumer.h>

#include <linux/regulator/consumer.h>





#include <asm/mach-types.h>

#include <asm/mach-types.h>





#include "board.h"

#include "board.h"

#include "board-harmony.h"





#ifdef CONFIG_TEGRA_PCI

#ifdef CONFIG_TEGRA_PCI





int __init harmony_pcie_init(void)

int __init harmony_pcie_init(void)

{

{

	struct device_node *np;

	int en_vdd_1v05;

	struct regulator *regulator = NULL;

	struct regulator *regulator = NULL;

	int err;

	int err;





	err = gpio_request(TEGRA_GPIO_EN_VDD_1V05_GPIO, "EN_VDD_1V05");

	np = of_find_node_by_path("/regulators/regulator@3");

	if (err)

	if (!np) {

		pr_err("%s: of_find_node_by_path failed\n", __func__);

		return -ENODEV;

	}



	en_vdd_1v05 = of_get_named_gpio(np, "gpio", 0);

	if (en_vdd_1v05 < 0) {

		pr_err("%s: of_get_named_gpio failed: %d\n", __func__,

		       en_vdd_1v05);

		return en_vdd_1v05;

	}



	err = gpio_request(en_vdd_1v05, "EN_VDD_1V05");

	if (err) {

		pr_err("%s: gpio_request failed: %d\n", __func__, err);

		return err;

		return err;

	}





	gpio_direction_output(TEGRA_GPIO_EN_VDD_1V05_GPIO, 1);

	gpio_direction_output(en_vdd_1v05, 1);





	regulator = regulator_get(NULL, "pex_clk");

	regulator = regulator_get(NULL, "vdd_ldo0,vddio_pex_clk");

	if (IS_ERR_OR_NULL(regulator))

	if (IS_ERR_OR_NULL(regulator)) {

		pr_err("%s: regulator_get failed: %d\n", __func__,

		       (int)PTR_ERR(regulator));

		goto err_reg;

		goto err_reg;

	}





	regulator_enable(regulator);

	regulator_enable(regulator);





	err = tegra_pcie_init(true, true);

	err = tegra_pcie_init(true, true);

	if (err)

	if (err) {

		pr_err("%s: tegra_pcie_init failed: %d\n", __func__, err);

		goto err_pcie;

		goto err_pcie;

	}





	return 0;

	return 0;
@@ -54,20 +76,9 @@ err_pcie: 
	regulator_disable(regulator);

	regulator_disable(regulator);

	regulator_put(regulator);

	regulator_put(regulator);

err_reg:

err_reg:

	gpio_free(TEGRA_GPIO_EN_VDD_1V05_GPIO);

	gpio_free(en_vdd_1v05);





	return err;

	return err;

}

}





static int __init harmony_pcie_initcall(void)

{

	if (!machine_is_harmony())

		return 0;



	return harmony_pcie_init();

}



/* PCI should be initialized after I2C, mfd and regulators */

subsys_initcall_sync(harmony_pcie_initcall);



#endif
 
#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE