Merge branch 'tegra/cleanup' into next/dt
Dependency for tegra/dt branch. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
commit
1f2bbf310a
30 changed files with 21 additions and 69 deletions
|
|
@ -15,7 +15,7 @@ Child device nodes describe the memory settings for different configurations and
|
|||
|
||||
Example:
|
||||
|
||||
emc@7000f400 {
|
||||
memory-controller@7000f400 {
|
||||
#address-cells = < 1 >;
|
||||
#size-cells = < 0 >;
|
||||
compatible = "nvidia,tegra20-emc";
|
||||
|
|
@ -8,7 +8,7 @@ Required properties:
|
|||
- interrupts : Should contain MC General interrupt.
|
||||
|
||||
Example:
|
||||
mc {
|
||||
memory-controller@0x7000f000 {
|
||||
compatible = "nvidia,tegra20-mc";
|
||||
reg = <0x7000f000 0x024
|
||||
0x7000f03c 0x3c4>;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ Required properties:
|
|||
- interrupts : Should contain MC General interrupt.
|
||||
|
||||
Example:
|
||||
mc {
|
||||
memory-controller {
|
||||
compatible = "nvidia,tegra30-mc";
|
||||
reg = <0x7000f000 0x010
|
||||
0x7000f03c 0x1b4
|
||||
|
|
|
|||
|
|
@ -307,7 +307,6 @@
|
|||
cd-gpios = <&gpio 58 0>; /* gpio PH2 */
|
||||
wp-gpios = <&gpio 59 0>; /* gpio PH3 */
|
||||
power-gpios = <&gpio 70 0>; /* gpio PI6 */
|
||||
support-8bit;
|
||||
bus-width = <8>;
|
||||
};
|
||||
|
||||
|
|
@ -301,7 +301,6 @@
|
|||
|
||||
sdhci@c8000600 {
|
||||
status = "okay";
|
||||
support-8bit;
|
||||
bus-width = <8>;
|
||||
};
|
||||
|
||||
|
|
@ -334,7 +334,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
emc {
|
||||
memory-controller@0x7000f400 {
|
||||
emc-table@190000 {
|
||||
reg = <190000>;
|
||||
compatible = "nvidia,tegra20-emc-table";
|
||||
|
|
@ -397,7 +397,6 @@
|
|||
|
||||
sdhci@c8000600 {
|
||||
status = "okay";
|
||||
support-8bit;
|
||||
bus-width = <8>;
|
||||
};
|
||||
|
||||
|
|
@ -314,7 +314,6 @@
|
|||
|
||||
sdhci@c8000600 {
|
||||
status = "okay";
|
||||
support-8bit;
|
||||
bus-width = <8>;
|
||||
};
|
||||
|
||||
|
|
@ -164,7 +164,7 @@
|
|||
reg = <0x7000e400 0x400>;
|
||||
};
|
||||
|
||||
mc {
|
||||
memory-controller@0x7000f000 {
|
||||
compatible = "nvidia,tegra20-mc";
|
||||
reg = <0x7000f000 0x024
|
||||
0x7000f03c 0x3c4>;
|
||||
|
|
@ -177,7 +177,7 @@
|
|||
0x58000000 0x02000000>; /* GART aperture */
|
||||
};
|
||||
|
||||
emc {
|
||||
memory-controller@0x7000f400 {
|
||||
compatible = "nvidia,tegra20-emc";
|
||||
reg = <0x7000f400 0x200>;
|
||||
#address-cells = <1>;
|
||||
|
|
|
|||
|
|
@ -144,7 +144,6 @@
|
|||
|
||||
sdhci@78000600 {
|
||||
status = "okay";
|
||||
support-8bit;
|
||||
bus-width = <8>;
|
||||
};
|
||||
|
||||
|
|
@ -167,7 +167,7 @@
|
|||
reg = <0x7000e400 0x400>;
|
||||
};
|
||||
|
||||
mc {
|
||||
memory-controller {
|
||||
compatible = "nvidia,tegra30-mc";
|
||||
reg = <0x7000f000 0x010
|
||||
0x7000f03c 0x1b4
|
||||
|
|
|
|||
|
|
@ -63,7 +63,6 @@ comment "Tegra board type"
|
|||
config MACH_HARMONY
|
||||
bool "Harmony board"
|
||||
depends on ARCH_TEGRA_2x_SOC
|
||||
select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
|
||||
help
|
||||
Support for nVidia Harmony development platform
|
||||
|
||||
|
|
@ -71,7 +70,6 @@ config MACH_KAEN
|
|||
bool "Kaen board"
|
||||
depends on ARCH_TEGRA_2x_SOC
|
||||
select MACH_SEABOARD
|
||||
select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
|
||||
help
|
||||
Support for the Kaen version of Seaboard
|
||||
|
||||
|
|
@ -84,7 +82,6 @@ config MACH_PAZ00
|
|||
config MACH_SEABOARD
|
||||
bool "Seaboard board"
|
||||
depends on ARCH_TEGRA_2x_SOC
|
||||
select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
|
||||
help
|
||||
Support for nVidia Seaboard development platform. It will
|
||||
also be included for some of the derivative boards that
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@ zreladdr-$(CONFIG_ARCH_TEGRA_2x_SOC) += 0x00008000
|
|||
params_phys-$(CONFIG_ARCH_TEGRA_2x_SOC) := 0x00000100
|
||||
initrd_phys-$(CONFIG_ARCH_TEGRA_2x_SOC) := 0x00800000
|
||||
|
||||
dtb-$(CONFIG_MACH_HARMONY) += tegra-harmony.dtb
|
||||
dtb-$(CONFIG_MACH_PAZ00) += tegra-paz00.dtb
|
||||
dtb-$(CONFIG_MACH_SEABOARD) += tegra-seaboard.dtb
|
||||
dtb-$(CONFIG_MACH_TRIMSLICE) += tegra-trimslice.dtb
|
||||
dtb-$(CONFIG_MACH_VENTANA) += tegra-ventana.dtb
|
||||
dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra-cardhu.dtb
|
||||
dtb-$(CONFIG_MACH_HARMONY) += tegra20-harmony.dtb
|
||||
dtb-$(CONFIG_MACH_PAZ00) += tegra20-paz00.dtb
|
||||
dtb-$(CONFIG_MACH_SEABOARD) += tegra20-seaboard.dtb
|
||||
dtb-$(CONFIG_MACH_TRIMSLICE) += tegra20-trimslice.dtb
|
||||
dtb-$(CONFIG_MACH_VENTANA) += tegra20-ventana.dtb
|
||||
dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30-cardhu.dtb
|
||||
|
|
|
|||
|
|
@ -27,9 +27,9 @@
|
|||
#include <linux/cpuidle.h>
|
||||
#include <linux/hrtimer.h>
|
||||
|
||||
#include <mach/iomap.h>
|
||||
#include <asm/proc-fns.h>
|
||||
|
||||
extern void tegra_cpu_wfi(void);
|
||||
#include <mach/iomap.h>
|
||||
|
||||
static int tegra_idle_enter_lp3(struct cpuidle_device *dev,
|
||||
struct cpuidle_driver *drv, int index);
|
||||
|
|
@ -64,7 +64,7 @@ static int tegra_idle_enter_lp3(struct cpuidle_device *dev,
|
|||
|
||||
enter = ktime_get();
|
||||
|
||||
tegra_cpu_wfi();
|
||||
cpu_do_idle();
|
||||
|
||||
exit = ktime_sub(ktime_get(), enter);
|
||||
us = ktime_to_us(exit);
|
||||
|
|
|
|||
|
|
@ -62,32 +62,3 @@
|
|||
movw \reg, #:lower16:\val
|
||||
movt \reg, #:upper16:\val
|
||||
.endm
|
||||
|
||||
/*
|
||||
* tegra_cpu_wfi
|
||||
*
|
||||
* puts current CPU in clock-gated wfi using the flow controller
|
||||
*
|
||||
* corrupts r0-r3
|
||||
* must be called with MMU on
|
||||
*/
|
||||
|
||||
ENTRY(tegra_cpu_wfi)
|
||||
cpu_id r0
|
||||
cpu_to_halt_reg r1, r0
|
||||
cpu_to_csr_reg r2, r0
|
||||
mov32 r0, TEGRA_FLOW_CTRL_VIRT
|
||||
mov r3, #FLOW_CTRL_CSR_INTR_FLAG | FLOW_CTRL_CSR_EVENT_FLAG
|
||||
str r3, [r0, r2] @ clear event & interrupt status
|
||||
mov r3, #FLOW_CTRL_WAIT_FOR_INTERRUPT | FLOW_CTRL_JTAG_RESUME
|
||||
str r3, [r0, r1] @ put flow controller in wait irq mode
|
||||
dsb
|
||||
wfi
|
||||
mov r3, #0
|
||||
str r3, [r0, r1] @ clear flow controller halt status
|
||||
mov r3, #FLOW_CTRL_CSR_INTR_FLAG | FLOW_CTRL_CSR_EVENT_FLAG
|
||||
str r3, [r0, r2] @ clear event & interrupt status
|
||||
dsb
|
||||
mov pc, lr
|
||||
ENDPROC(tegra_cpu_wfi)
|
||||
|
||||
|
|
|
|||
|
|
@ -264,11 +264,6 @@ static int __devinit tegra_ahb_probe(struct platform_device *pdev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int __devexit tegra_ahb_remove(struct platform_device *pdev)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id tegra_ahb_of_match[] __devinitconst = {
|
||||
{ .compatible = "nvidia,tegra30-ahb", },
|
||||
{ .compatible = "nvidia,tegra20-ahb", },
|
||||
|
|
@ -277,7 +272,6 @@ static const struct of_device_id tegra_ahb_of_match[] __devinitconst = {
|
|||
|
||||
static struct platform_driver tegra_ahb_driver = {
|
||||
.probe = tegra_ahb_probe,
|
||||
.remove = __devexit_p(tegra_ahb_remove),
|
||||
.driver = {
|
||||
.name = DRV_NAME,
|
||||
.owner = THIS_MODULE,
|
||||
|
|
|
|||
|
|
@ -223,6 +223,7 @@ static struct tegra_sdhci_platform_data * __devinit sdhci_tegra_dt_parse_pdata(
|
|||
{
|
||||
struct tegra_sdhci_platform_data *plat;
|
||||
struct device_node *np = pdev->dev.of_node;
|
||||
u32 bus_width;
|
||||
|
||||
if (!np)
|
||||
return NULL;
|
||||
|
|
@ -236,7 +237,9 @@ static struct tegra_sdhci_platform_data * __devinit sdhci_tegra_dt_parse_pdata(
|
|||
plat->cd_gpio = of_get_named_gpio(np, "cd-gpios", 0);
|
||||
plat->wp_gpio = of_get_named_gpio(np, "wp-gpios", 0);
|
||||
plat->power_gpio = of_get_named_gpio(np, "power-gpios", 0);
|
||||
if (of_find_property(np, "support-8bit", NULL))
|
||||
|
||||
if (of_property_read_u32(np, "bus-width", &bus_width) == 0 &&
|
||||
bus_width == 8)
|
||||
plat->is_8bit = 1;
|
||||
|
||||
return plat;
|
||||
|
|
|
|||
|
|
@ -58,17 +58,9 @@ config SND_SOC_TEGRA_WM8753
|
|||
Say Y or M here if you want to add support for SoC audio on Tegra
|
||||
boards using the WM8753 codec, such as Whistler.
|
||||
|
||||
config MACH_HAS_SND_SOC_TEGRA_WM8903
|
||||
bool
|
||||
help
|
||||
Machines that use the SND_SOC_TEGRA_WM8903 driver should select
|
||||
this config option, in order to allow the user to enable
|
||||
SND_SOC_TEGRA_WM8903.
|
||||
|
||||
config SND_SOC_TEGRA_WM8903
|
||||
tristate "SoC Audio support for Tegra boards using a WM8903 codec"
|
||||
depends on SND_SOC_TEGRA && I2C
|
||||
depends on MACH_HAS_SND_SOC_TEGRA_WM8903
|
||||
select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC
|
||||
select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC
|
||||
select SND_SOC_WM8903
|
||||
|
|
@ -79,7 +71,7 @@ config SND_SOC_TEGRA_WM8903
|
|||
|
||||
config SND_SOC_TEGRA_TRIMSLICE
|
||||
tristate "SoC Audio support for TrimSlice board"
|
||||
depends on SND_SOC_TEGRA && MACH_TRIMSLICE && I2C
|
||||
depends on SND_SOC_TEGRA && I2C
|
||||
select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC
|
||||
select SND_SOC_TLV320AIC23
|
||||
help
|
||||
|
|
|
|||
Loading…
Reference in a new issue