Skip to content

Commit

Permalink
Merge branch 'tegra/cleanup' into next/soc
Browse files Browse the repository at this point in the history 
This is a dependency for the tegra/soc branch.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Arnd Bergmann committed Apr 9, 2013
2 parents 759417a + 6affb48 commit 3be1812
Show file tree
Hide file tree
Showing 31 changed files with 268 additions and 347 deletions.
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/tegra114.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
};

pmc {
compatible = "nvidia,tegra114-pmc", "nvidia,tegra30-pmc";
compatible = "nvidia,tegra114-pmc";
reg = <0x7000e400 0x400>;
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/tegra20-colibri-512.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@
};

sdhci@c8000600 {
cd-gpios = <&gpio 23 0>; /* gpio PC7 */
cd-gpios = <&gpio 23 1>; /* gpio PC7 */
};

sound {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/tegra20-harmony.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,15 +437,15 @@

sdhci@c8000200 {
status = "okay";
cd-gpios = <&gpio 69 0>; /* gpio PI5 */
cd-gpios = <&gpio 69 1>; /* gpio PI5 */
wp-gpios = <&gpio 57 0>; /* gpio PH1 */
power-gpios = <&gpio 155 0>; /* gpio PT3 */
bus-width = <4>;
};

sdhci@c8000600 {
status = "okay";
cd-gpios = <&gpio 58 0>; /* gpio PH2 */
cd-gpios = <&gpio 58 1>; /* gpio PH2 */
wp-gpios = <&gpio 59 0>; /* gpio PH3 */
power-gpios = <&gpio 70 0>; /* gpio PI6 */
bus-width = <8>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/tegra20-paz00.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@

sdhci@c8000000 {
status = "okay";
cd-gpios = <&gpio 173 0>; /* gpio PV5 */
cd-gpios = <&gpio 173 1>; /* gpio PV5 */
wp-gpios = <&gpio 57 0>; /* gpio PH1 */
power-gpios = <&gpio 169 0>; /* gpio PV1 */
bus-width = <4>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/tegra20-seaboard.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@

sdhci@c8000400 {
status = "okay";
cd-gpios = <&gpio 69 0>; /* gpio PI5 */
cd-gpios = <&gpio 69 1>; /* gpio PI5 */
wp-gpios = <&gpio 57 0>; /* gpio PH1 */
power-gpios = <&gpio 70 0>; /* gpio PI6 */
bus-width = <4>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/tegra20-tamonten.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@
};

sdhci@c8000600 {
cd-gpios = <&gpio 58 0>; /* gpio PH2 */
cd-gpios = <&gpio 58 1>; /* gpio PH2 */
wp-gpios = <&gpio 59 0>; /* gpio PH3 */
bus-width = <4>;
status = "okay";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/tegra20-trimslice.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@

sdhci@c8000600 {
status = "okay";
cd-gpios = <&gpio 121 0>; /* gpio PP1 */
cd-gpios = <&gpio 121 1>; /* gpio PP1 */
wp-gpios = <&gpio 122 0>; /* gpio PP2 */
bus-width = <4>;
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/tegra20-ventana.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@

sdhci@c8000400 {
status = "okay";
cd-gpios = <&gpio 69 0>; /* gpio PI5 */
cd-gpios = <&gpio 69 1>; /* gpio PI5 */
wp-gpios = <&gpio 57 0>; /* gpio PH1 */
power-gpios = <&gpio 70 0>; /* gpio PI6 */
bus-width = <4>;
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/tegra20-whistler.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,7 @@

sdhci@c8000400 {
status = "okay";
cd-gpios = <&gpio 69 1>; /* gpio PI5 */
wp-gpios = <&gpio 173 0>; /* gpio PV5 */
bus-width = <8>;
};
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/boot/dts/tegra20.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@
0 1 0x04
0 41 0x04
0 42 0x04>;
clocks = <&tegra_car 5>;
};

tegra_car: clock {
Expand Down Expand Up @@ -304,6 +305,7 @@
compatible = "nvidia,tegra20-rtc";
reg = <0x7000e000 0x100>;
interrupts = <0 2 0x04>;
clocks = <&tegra_car 4>;
};

i2c@7000c000 {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/tegra30-beaver.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@

sdhci@78000000 {
status = "okay";
cd-gpios = <&gpio 69 0>; /* gpio PI5 */
cd-gpios = <&gpio 69 1>; /* gpio PI5 */
wp-gpios = <&gpio 155 0>; /* gpio PT3 */
power-gpios = <&gpio 31 0>; /* gpio PD7 */
bus-width = <4>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/tegra30-cardhu.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@

sdhci@78000000 {
status = "okay";
cd-gpios = <&gpio 69 0>; /* gpio PI5 */
cd-gpios = <&gpio 69 1>; /* gpio PI5 */
wp-gpios = <&gpio 155 0>; /* gpio PT3 */
power-gpios = <&gpio 31 0>; /* gpio PD7 */
bus-width = <4>;
Expand Down
4 changes: 3 additions & 1 deletion arch/arm/boot/dts/tegra30.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@
0 42 0x04
0 121 0x04
0 122 0x04>;
clocks = <&tegra_car 5>;
};

tegra_car: clock {
Expand Down Expand Up @@ -291,6 +292,7 @@
compatible = "nvidia,tegra30-rtc", "nvidia,tegra20-rtc";
reg = <0x7000e000 0x100>;
interrupts = <0 2 0x04>;
clocks = <&tegra_car 4>;
};

i2c@7000c000 {
Expand Down Expand Up @@ -423,7 +425,7 @@
};

pmc {
compatible = "nvidia,tegra20-pmc", "nvidia,tegra30-pmc";
compatible = "nvidia,tegra30-pmc";
reg = <0x7000e400 0x400>;
};

Expand Down
4 changes: 1 addition & 3 deletions arch/arm/mach-tegra/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ obj-y += pm.o
obj-y += reset.o
obj-y += reset-handler.o
obj-y += sleep.o
obj-y += tegra.o
obj-$(CONFIG_CPU_IDLE) += cpuidle.o
obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20_speedo.o
obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_emc.o
Expand All @@ -27,9 +28,6 @@ obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
obj-$(CONFIG_CPU_FREQ) += cpu-tegra.o
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_ARCH_TEGRA_114_SOC) += board-dt-tegra114.o
ifeq ($(CONFIG_CPU_IDLE),y)
obj-$(CONFIG_ARCH_TEGRA_114_SOC) += cpuidle-tegra114.o
endif
Expand Down
46 changes: 0 additions & 46 deletions arch/arm/mach-tegra/board-dt-tegra114.c
View file

This file was deleted.

60 changes: 0 additions & 60 deletions arch/arm/mach-tegra/board-dt-tegra30.c
View file

This file was deleted.

7 changes: 6 additions & 1 deletion arch/arm/mach-tegra/board-harmony-pcie.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,11 @@ int __init harmony_pcie_init(void)
goto err_reg;
}

regulator_enable(regulator);
err = regulator_enable(regulator);
if (err) {
pr_err("%s: regulator_enable failed: %d\n", __func__, err);
goto err_en;
}

err = tegra_pcie_init(true, true);
if (err) {
Expand All @@ -74,6 +78,7 @@ int __init harmony_pcie_init(void)

err_pcie:
regulator_disable(regulator);
err_en:
regulator_put(regulator);
err_reg:
gpio_free(en_vdd_1v05);
Expand Down
4 changes: 1 addition & 3 deletions arch/arm/mach-tegra/board.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@

void tegra_assert_system_reset(char mode, const char *cmd);

void __init tegra20_init_early(void);
void __init tegra30_init_early(void);
void __init tegra114_init_early(void);
void __init tegra_init_early(void);
void __init tegra_map_common_io(void);
void __init tegra_init_irq(void);
void __init tegra_dt_init_irq(void);
Expand Down
26 changes: 2 additions & 24 deletions arch/arm/mach-tegra/common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,39 +94,17 @@ static void __init tegra_init_cache(void)

}

static void __init tegra_init_early(void)
void __init tegra_init_early(void)
{
tegra_cpu_reset_handler_init();
tegra_apb_io_init();
tegra_init_fuse();
tegra_init_cache();
tegra_pmc_init();
tegra_powergate_init();
tegra_hotplug_init();
}

#ifdef CONFIG_ARCH_TEGRA_2x_SOC
void __init tegra20_init_early(void)
{
tegra_init_early();
tegra20_hotplug_init();
}
#endif

#ifdef CONFIG_ARCH_TEGRA_3x_SOC
void __init tegra30_init_early(void)
{
tegra_init_early();
tegra30_hotplug_init();
}
#endif

#ifdef CONFIG_ARCH_TEGRA_114_SOC
void __init tegra114_init_early(void)
{
tegra_init_early();
}
#endif

void __init tegra_init_late(void)
{
tegra_powergate_debugfs_init();
Expand Down
4 changes: 0 additions & 4 deletions arch/arm/mach-tegra/cpuidle-tegra30.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,8 @@ static bool tegra30_cpu_core_power_down(struct cpuidle_device *dev,

smp_wmb();

save_cpu_arch_register();

cpu_suspend(0, tegra30_sleep_cpu_secondary_finish);

restore_cpu_arch_register();

clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu);

return true;
Expand Down
3 changes: 0 additions & 3 deletions arch/arm/mach-tegra/headsmp.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,5 @@

ENTRY(tegra_secondary_startup)
bl v7_invalidate_l1
/* Enable coresight */
mov32 r0, 0xC5ACCE55
mcr p14, 0, r0, c7, c12, 6
b secondary_startup
ENDPROC(tegra_secondary_startup)
Loading

0 comments on commit 3be1812

Please sign in to comment.