diff options
| -rw-r--r-- | arch/arm/boot/dts/tegra114-macallan.dts | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra114-roth.dts | 6 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-macallan.c | 32 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-roth.c | 30 |
4 files changed, 38 insertions, 36 deletions
diff --git a/arch/arm/boot/dts/tegra114-macallan.dts b/arch/arm/boot/dts/tegra114-macallan.dts index 44707e7394ac..decdc2b457dd 100644 --- a/arch/arm/boot/dts/tegra114-macallan.dts +++ b/arch/arm/boot/dts/tegra114-macallan.dts @@ -740,6 +740,12 @@ clock-frequency = <400000>; }; + spi@7000d400 { + status = "okay"; + spi-max-frequency = <25000000>; + nvidia,dma-request-selector = <&apbdma 0>; + }; + pmc { status = "okay"; nvidia,invert-interrupt; diff --git a/arch/arm/boot/dts/tegra114-roth.dts b/arch/arm/boot/dts/tegra114-roth.dts index dbeb7ccab374..e724cc705ef2 100644 --- a/arch/arm/boot/dts/tegra114-roth.dts +++ b/arch/arm/boot/dts/tegra114-roth.dts @@ -25,6 +25,12 @@ }; }; + spi@7000da00 { + status = "okay"; + spi-max-frequency = <25000000>; + nvidia,dma-request-selector = <&apbdma 0>; + }; + pmc { status = "okay"; nvidia,invert-interrupt; diff --git a/arch/arm/mach-tegra/board-macallan.c b/arch/arm/mach-tegra/board-macallan.c index 47f3d014ec21..02e192d8234e 100644 --- a/arch/arm/mach-tegra/board-macallan.c +++ b/arch/arm/mach-tegra/board-macallan.c @@ -498,24 +498,6 @@ static void macallan_audio_init(void) } -static struct platform_device *macallan_spi_devices[] __initdata = { - &tegra11_spi_device1, -}; - -static struct tegra_spi_platform_data macallan_spi_pdata = { - .spi_max_frequency = 25000000, - .is_clkon_always = false, -}; - -static void __init macallan_spi_init(void) -{ - macallan_spi_pdata.dma_req_sel = (tegra_revision == TEGRA_REVISION_A01) - ? 0 : 15 ; - tegra11_spi_device1.dev.platform_data = &macallan_spi_pdata; - platform_add_devices(macallan_spi_devices, - ARRAY_SIZE(macallan_spi_devices)); -} - static __initdata struct tegra_clk_init_table touch_clk_init_table[] = { /* name parent rate enabled */ { "extern2", "pll_p", 41000000, false}, @@ -600,6 +582,19 @@ struct of_dev_auxdata macallan_auxdata_lookup[] __initdata = { NULL), OF_DEV_AUXDATA("nvidia,tegra114-i2c", 0x7000d000, "tegra11-i2c.4", NULL), + OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000d400, "spi-tegra114.0", + NULL), + OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000d600, "spi-tegra114.1", + NULL), + OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000d800, "spi-tegra114.2", + NULL), + OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000da00, "spi-tegra114.3", + NULL), + OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000dc00, "spi-tegra114.4", + NULL), + OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000de00, "spi-tegra114.5", + NULL), + {} }; #endif @@ -618,7 +613,6 @@ static void __init tegra_macallan_late_init(void) platform_device_register(&tegra114_pinctrl_device); macallan_pinmux_init(); macallan_i2c_init(); - macallan_spi_init(); macallan_usb_init(); macallan_uart_init(); macallan_audio_init(); diff --git a/arch/arm/mach-tegra/board-roth.c b/arch/arm/mach-tegra/board-roth.c index 857d50b991d4..63a3e5592b41 100644 --- a/arch/arm/mach-tegra/board-roth.c +++ b/arch/arm/mach-tegra/board-roth.c @@ -533,22 +533,6 @@ static void roth_audio_init(void) roth_audio_pdata.codec_dai_name = "rt5640-aif1"; } - -static struct platform_device *roth_spi_devices[] __initdata = { - &tegra11_spi_device4, -}; - -static struct tegra_spi_platform_data roth_spi_pdata = { - .spi_max_frequency = 25000000, - .is_clkon_always = false, -}; - -static void __init roth_spi_init(void) -{ - tegra11_spi_device4.dev.platform_data = &roth_spi_pdata; - platform_add_devices(roth_spi_devices, ARRAY_SIZE(roth_spi_devices)); -} - static __initdata struct tegra_clk_init_table touch_clk_init_table[] = { /* name parent rate enabled */ { "extern2", "pll_p", 41000000, false}, @@ -627,7 +611,6 @@ static void __init tegra_roth_init(void) tegra_enable_pinmux(); roth_pinmux_init(); roth_i2c_init(); - roth_spi_init(); roth_usb_init(); roth_uart_init(); roth_led_init(); @@ -679,6 +662,19 @@ struct of_dev_auxdata roth_auxdata_lookup[] __initdata = { OF_DEV_AUXDATA("nvidia,tegra114-vi", TEGRA_VI_BASE, "vi", NULL), OF_DEV_AUXDATA("nvidia,tegra114-isp", TEGRA_ISP_BASE, "isp", NULL), OF_DEV_AUXDATA("nvidia,tegra114-tsec", TEGRA_TSEC_BASE, "tsec", NULL), + OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000d400, "spi-tegra114.0", + NULL), + OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000d600, "spi-tegra114.1", + NULL), + OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000d800, "spi-tegra114.2", + NULL), + OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000da00, "spi-tegra114.3", + NULL), + OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000dc00, "spi-tegra114.4", + NULL), + OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000de00, "spi-tegra114.5", + NULL), + {} }; #endif |