* [PATCH 1/3] ARM: tegra: remove UART5/UARTE from tegra124.dtsi @ 2014-04-01 20:13 ` Stephen Warren 0 siblings, 0 replies; 12+ messages in thread From: Stephen Warren @ 2014-04-01 20:13 UTC (permalink / raw) To: arm, Mike Turquette Cc: Peter De Schrijver, Laxman Dewangan, linux-arm-kernel, linux-tegra, Stephen Warren, stable From: Stephen Warren <swarren@nvidia.com> Tegra124 only has 4 UARTs. Parts of the documentation hint at a fifth UART, but this appears to be left-over from earlier SoC documentation. Remove the non-existent DT node for UART5. Cc: <stable@vger.kernel.org> Signed-off-by: Stephen Warren <swarren@nvidia.com> --- arch/arm/boot/dts/tegra124.dtsi | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi index cf45a1a39483..6d540a025148 100644 --- a/arch/arm/boot/dts/tegra124.dtsi +++ b/arch/arm/boot/dts/tegra124.dtsi @@ -233,19 +233,6 @@ status = "disabled"; }; - serial@0,70006400 { - compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart"; - reg = <0x0 0x70006400 0x0 0x40>; - reg-shift = <2>; - interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&tegra_car TEGRA124_CLK_UARTE>; - resets = <&tegra_car 66>; - reset-names = "serial"; - dmas = <&apbdma 20>, <&apbdma 20>; - dma-names = "rx", "tx"; - status = "disabled"; - }; - pwm@0,7000a000 { compatible = "nvidia,tegra124-pwm", "nvidia,tegra20-pwm"; reg = <0x0 0x7000a000 0x0 0x100>; -- 1.8.1.5 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 1/3] ARM: tegra: remove UART5/UARTE from tegra124.dtsi @ 2014-04-01 20:13 ` Stephen Warren 0 siblings, 0 replies; 12+ messages in thread From: Stephen Warren @ 2014-04-01 20:13 UTC (permalink / raw) To: linux-arm-kernel From: Stephen Warren <swarren@nvidia.com> Tegra124 only has 4 UARTs. Parts of the documentation hint at a fifth UART, but this appears to be left-over from earlier SoC documentation. Remove the non-existent DT node for UART5. Cc: <stable@vger.kernel.org> Signed-off-by: Stephen Warren <swarren@nvidia.com> --- arch/arm/boot/dts/tegra124.dtsi | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi index cf45a1a39483..6d540a025148 100644 --- a/arch/arm/boot/dts/tegra124.dtsi +++ b/arch/arm/boot/dts/tegra124.dtsi @@ -233,19 +233,6 @@ status = "disabled"; }; - serial at 0,70006400 { - compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart"; - reg = <0x0 0x70006400 0x0 0x40>; - reg-shift = <2>; - interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&tegra_car TEGRA124_CLK_UARTE>; - resets = <&tegra_car 66>; - reset-names = "serial"; - dmas = <&apbdma 20>, <&apbdma 20>; - dma-names = "rx", "tx"; - status = "disabled"; - }; - pwm at 0,7000a000 { compatible = "nvidia,tegra124-pwm", "nvidia,tegra20-pwm"; reg = <0x0 0x7000a000 0x0 0x100>; -- 1.8.1.5 ^ permalink raw reply related [flat|nested] 12+ messages in thread
[parent not found: <1396383197-5979-1-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>]
* [PATCH 2/3] clk: tegra: remove non-existent clocks 2014-04-01 20:13 ` Stephen Warren @ 2014-04-01 20:13 ` Stephen Warren -1 siblings, 0 replies; 12+ messages in thread From: Stephen Warren @ 2014-04-01 20:13 UTC (permalink / raw) To: arm-DgEjT+Ai2ygdnm+yROfE0A, Mike Turquette Cc: Peter De Schrijver, Laxman Dewangan, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-tegra-u79uwXL29TY76Z2rM5mHXA, Stephen Warren, stable-u79uwXL29TY76Z2rM5mHXA From: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> The Tegra124 clock driver currently provides 3 clocks that don't actually exist; 2 for NAND and one for UART5/UARTE. Delete these. Cc: <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> --- drivers/clk/tegra/clk-tegra124.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/clk/tegra/clk-tegra124.c b/drivers/clk/tegra/clk-tegra124.c index 166e02f16c8a..cc37c342c4cb 100644 --- a/drivers/clk/tegra/clk-tegra124.c +++ b/drivers/clk/tegra/clk-tegra124.c @@ -764,7 +764,6 @@ static struct tegra_clk tegra124_clks[tegra_clk_max] __initdata = { [tegra_clk_sdmmc2_8] = { .dt_id = TEGRA124_CLK_SDMMC2, .present = true }, [tegra_clk_i2s1] = { .dt_id = TEGRA124_CLK_I2S1, .present = true }, [tegra_clk_i2c1] = { .dt_id = TEGRA124_CLK_I2C1, .present = true }, - [tegra_clk_ndflash] = { .dt_id = TEGRA124_CLK_NDFLASH, .present = true }, [tegra_clk_sdmmc1_8] = { .dt_id = TEGRA124_CLK_SDMMC1, .present = true }, [tegra_clk_sdmmc4_8] = { .dt_id = TEGRA124_CLK_SDMMC4, .present = true }, [tegra_clk_pwm] = { .dt_id = TEGRA124_CLK_PWM, .present = true }, @@ -809,7 +808,6 @@ static struct tegra_clk tegra124_clks[tegra_clk_max] __initdata = { [tegra_clk_trace] = { .dt_id = TEGRA124_CLK_TRACE, .present = true }, [tegra_clk_soc_therm] = { .dt_id = TEGRA124_CLK_SOC_THERM, .present = true }, [tegra_clk_dtv] = { .dt_id = TEGRA124_CLK_DTV, .present = true }, - [tegra_clk_ndspeed] = { .dt_id = TEGRA124_CLK_NDSPEED, .present = true }, [tegra_clk_i2cslow] = { .dt_id = TEGRA124_CLK_I2CSLOW, .present = true }, [tegra_clk_dsib] = { .dt_id = TEGRA124_CLK_DSIB, .present = true }, [tegra_clk_tsec] = { .dt_id = TEGRA124_CLK_TSEC, .present = true }, @@ -952,7 +950,6 @@ static struct tegra_clk tegra124_clks[tegra_clk_max] __initdata = { [tegra_clk_clk_out_3_mux] = { .dt_id = TEGRA124_CLK_CLK_OUT_3_MUX, .present = true }, [tegra_clk_dsia_mux] = { .dt_id = TEGRA124_CLK_DSIA_MUX, .present = true }, [tegra_clk_dsib_mux] = { .dt_id = TEGRA124_CLK_DSIB_MUX, .present = true }, - [tegra_clk_uarte] = { .dt_id = TEGRA124_CLK_UARTE, .present = true }, }; static struct tegra_devclk devclks[] __initdata = { -- 1.8.1.5 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/3] clk: tegra: remove non-existent clocks @ 2014-04-01 20:13 ` Stephen Warren 0 siblings, 0 replies; 12+ messages in thread From: Stephen Warren @ 2014-04-01 20:13 UTC (permalink / raw) To: linux-arm-kernel From: Stephen Warren <swarren@nvidia.com> The Tegra124 clock driver currently provides 3 clocks that don't actually exist; 2 for NAND and one for UART5/UARTE. Delete these. Cc: <stable@vger.kernel.org> Signed-off-by: Stephen Warren <swarren@nvidia.com> --- drivers/clk/tegra/clk-tegra124.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/clk/tegra/clk-tegra124.c b/drivers/clk/tegra/clk-tegra124.c index 166e02f16c8a..cc37c342c4cb 100644 --- a/drivers/clk/tegra/clk-tegra124.c +++ b/drivers/clk/tegra/clk-tegra124.c @@ -764,7 +764,6 @@ static struct tegra_clk tegra124_clks[tegra_clk_max] __initdata = { [tegra_clk_sdmmc2_8] = { .dt_id = TEGRA124_CLK_SDMMC2, .present = true }, [tegra_clk_i2s1] = { .dt_id = TEGRA124_CLK_I2S1, .present = true }, [tegra_clk_i2c1] = { .dt_id = TEGRA124_CLK_I2C1, .present = true }, - [tegra_clk_ndflash] = { .dt_id = TEGRA124_CLK_NDFLASH, .present = true }, [tegra_clk_sdmmc1_8] = { .dt_id = TEGRA124_CLK_SDMMC1, .present = true }, [tegra_clk_sdmmc4_8] = { .dt_id = TEGRA124_CLK_SDMMC4, .present = true }, [tegra_clk_pwm] = { .dt_id = TEGRA124_CLK_PWM, .present = true }, @@ -809,7 +808,6 @@ static struct tegra_clk tegra124_clks[tegra_clk_max] __initdata = { [tegra_clk_trace] = { .dt_id = TEGRA124_CLK_TRACE, .present = true }, [tegra_clk_soc_therm] = { .dt_id = TEGRA124_CLK_SOC_THERM, .present = true }, [tegra_clk_dtv] = { .dt_id = TEGRA124_CLK_DTV, .present = true }, - [tegra_clk_ndspeed] = { .dt_id = TEGRA124_CLK_NDSPEED, .present = true }, [tegra_clk_i2cslow] = { .dt_id = TEGRA124_CLK_I2CSLOW, .present = true }, [tegra_clk_dsib] = { .dt_id = TEGRA124_CLK_DSIB, .present = true }, [tegra_clk_tsec] = { .dt_id = TEGRA124_CLK_TSEC, .present = true }, @@ -952,7 +950,6 @@ static struct tegra_clk tegra124_clks[tegra_clk_max] __initdata = { [tegra_clk_clk_out_3_mux] = { .dt_id = TEGRA124_CLK_CLK_OUT_3_MUX, .present = true }, [tegra_clk_dsia_mux] = { .dt_id = TEGRA124_CLK_DSIA_MUX, .present = true }, [tegra_clk_dsib_mux] = { .dt_id = TEGRA124_CLK_DSIB_MUX, .present = true }, - [tegra_clk_uarte] = { .dt_id = TEGRA124_CLK_UARTE, .present = true }, }; static struct tegra_devclk devclks[] __initdata = { -- 1.8.1.5 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 2/3] clk: tegra: remove non-existent clocks 2014-04-01 20:13 ` Stephen Warren @ 2014-04-02 8:10 ` Peter De Schrijver -1 siblings, 0 replies; 12+ messages in thread From: Peter De Schrijver @ 2014-04-02 8:10 UTC (permalink / raw) To: Stephen Warren Cc: arm, Mike Turquette, Laxman Dewangan, linux-arm-kernel, linux-tegra, Stephen Warren, stable On Tue, Apr 01, 2014 at 10:13:16PM +0200, Stephen Warren wrote: > From: Stephen Warren <swarren@nvidia.com> > > The Tegra124 clock driver currently provides 3 clocks that don't actually > exist; 2 for NAND and one for UART5/UARTE. Delete these. > > Cc: <stable@vger.kernel.org> > Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-By: Peter De Schrijver <pdeschrijver@nvidia.com> Cheers, Peter. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/3] clk: tegra: remove non-existent clocks @ 2014-04-02 8:10 ` Peter De Schrijver 0 siblings, 0 replies; 12+ messages in thread From: Peter De Schrijver @ 2014-04-02 8:10 UTC (permalink / raw) To: linux-arm-kernel On Tue, Apr 01, 2014 at 10:13:16PM +0200, Stephen Warren wrote: > From: Stephen Warren <swarren@nvidia.com> > > The Tegra124 clock driver currently provides 3 clocks that don't actually > exist; 2 for NAND and one for UART5/UARTE. Delete these. > > Cc: <stable@vger.kernel.org> > Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-By: Peter De Schrijver <pdeschrijver@nvidia.com> Cheers, Peter. ^ permalink raw reply [flat|nested] 12+ messages in thread
[parent not found: <1396383197-5979-2-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>]
* Re: [PATCH 2/3] clk: tegra: remove non-existent clocks 2014-04-01 20:13 ` Stephen Warren @ 2014-04-23 16:24 ` Stephen Warren -1 siblings, 0 replies; 12+ messages in thread From: Stephen Warren @ 2014-04-23 16:24 UTC (permalink / raw) To: arm-DgEjT+Ai2ygdnm+yROfE0A, Mike Turquette Cc: Peter De Schrijver, Laxman Dewangan, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-tegra-u79uwXL29TY76Z2rM5mHXA, Stephen Warren, stable-u79uwXL29TY76Z2rM5mHXA On 04/01/2014 02:13 PM, Stephen Warren wrote: > From: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> > > The Tegra124 clock driver currently provides 3 clocks that don't actually > exist; 2 for NAND and one for UART5/UARTE. Delete these. Mike, are you OK with this patch? Can I get your ack so this patch can be taken into a branch with a couple other patches that it depends or or depend on it. arm-soc, I was hoping this whole series would get applied for 3.15 through the arm-soc tree. Is there any issue with that? ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/3] clk: tegra: remove non-existent clocks @ 2014-04-23 16:24 ` Stephen Warren 0 siblings, 0 replies; 12+ messages in thread From: Stephen Warren @ 2014-04-23 16:24 UTC (permalink / raw) To: linux-arm-kernel On 04/01/2014 02:13 PM, Stephen Warren wrote: > From: Stephen Warren <swarren@nvidia.com> > > The Tegra124 clock driver currently provides 3 clocks that don't actually > exist; 2 for NAND and one for UART5/UARTE. Delete these. Mike, are you OK with this patch? Can I get your ack so this patch can be taken into a branch with a couple other patches that it depends or or depend on it. arm-soc, I was hoping this whole series would get applied for 3.15 through the arm-soc tree. Is there any issue with that? ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 3/3] dt: tegra: remove non-existent clock IDs 2014-04-01 20:13 ` Stephen Warren @ 2014-04-01 20:13 ` Stephen Warren -1 siblings, 0 replies; 12+ messages in thread From: Stephen Warren @ 2014-04-01 20:13 UTC (permalink / raw) To: arm, Mike Turquette Cc: Peter De Schrijver, Laxman Dewangan, linux-arm-kernel, linux-tegra, Stephen Warren, stable From: Stephen Warren <swarren@nvidia.com> The Tegra124 clock DT binding currently provides 3 clocks that don't actually exist; 2 for NAND and one for UART5/UARTE. Delete these. While this is technically an incompatible DT ABI change, nothing could have used these clock IDs for anything practical, since the HW doesn't exist. Cc: <stable@vger.kernel.org> Signed-off-by: Stephen Warren <swarren@nvidia.com> --- This depends on the previous 2 patches. Either all the patches can be taken through the same tree with acks, or we can hold of applying this patch until the other two make it into Linus' tree. --- include/dt-bindings/clock/tegra124-car.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/dt-bindings/clock/tegra124-car.h b/include/dt-bindings/clock/tegra124-car.h index 8c1603b10665..433528ab5161 100644 --- a/include/dt-bindings/clock/tegra124-car.h +++ b/include/dt-bindings/clock/tegra124-car.h @@ -29,7 +29,7 @@ /* 10 (register bit affects spdif_in and spdif_out) */ #define TEGRA124_CLK_I2S1 11 #define TEGRA124_CLK_I2C1 12 -#define TEGRA124_CLK_NDFLASH 13 +/* 13 */ #define TEGRA124_CLK_SDMMC1 14 #define TEGRA124_CLK_SDMMC4 15 /* 16 */ @@ -83,7 +83,7 @@ /* 64 */ #define TEGRA124_CLK_UARTD 65 -#define TEGRA124_CLK_UARTE 66 +/* 66 */ #define TEGRA124_CLK_I2C3 67 #define TEGRA124_CLK_SBC4 68 #define TEGRA124_CLK_SDMMC3 69 @@ -97,7 +97,7 @@ #define TEGRA124_CLK_TRACE 77 #define TEGRA124_CLK_SOC_THERM 78 #define TEGRA124_CLK_DTV 79 -#define TEGRA124_CLK_NDSPEED 80 +/* 80 */ #define TEGRA124_CLK_I2CSLOW 81 #define TEGRA124_CLK_DSIB 82 #define TEGRA124_CLK_TSEC 83 -- 1.8.1.5 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/3] dt: tegra: remove non-existent clock IDs @ 2014-04-01 20:13 ` Stephen Warren 0 siblings, 0 replies; 12+ messages in thread From: Stephen Warren @ 2014-04-01 20:13 UTC (permalink / raw) To: linux-arm-kernel From: Stephen Warren <swarren@nvidia.com> The Tegra124 clock DT binding currently provides 3 clocks that don't actually exist; 2 for NAND and one for UART5/UARTE. Delete these. While this is technically an incompatible DT ABI change, nothing could have used these clock IDs for anything practical, since the HW doesn't exist. Cc: <stable@vger.kernel.org> Signed-off-by: Stephen Warren <swarren@nvidia.com> --- This depends on the previous 2 patches. Either all the patches can be taken through the same tree with acks, or we can hold of applying this patch until the other two make it into Linus' tree. --- include/dt-bindings/clock/tegra124-car.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/dt-bindings/clock/tegra124-car.h b/include/dt-bindings/clock/tegra124-car.h index 8c1603b10665..433528ab5161 100644 --- a/include/dt-bindings/clock/tegra124-car.h +++ b/include/dt-bindings/clock/tegra124-car.h @@ -29,7 +29,7 @@ /* 10 (register bit affects spdif_in and spdif_out) */ #define TEGRA124_CLK_I2S1 11 #define TEGRA124_CLK_I2C1 12 -#define TEGRA124_CLK_NDFLASH 13 +/* 13 */ #define TEGRA124_CLK_SDMMC1 14 #define TEGRA124_CLK_SDMMC4 15 /* 16 */ @@ -83,7 +83,7 @@ /* 64 */ #define TEGRA124_CLK_UARTD 65 -#define TEGRA124_CLK_UARTE 66 +/* 66 */ #define TEGRA124_CLK_I2C3 67 #define TEGRA124_CLK_SBC4 68 #define TEGRA124_CLK_SDMMC3 69 @@ -97,7 +97,7 @@ #define TEGRA124_CLK_TRACE 77 #define TEGRA124_CLK_SOC_THERM 78 #define TEGRA124_CLK_DTV 79 -#define TEGRA124_CLK_NDSPEED 80 +/* 80 */ #define TEGRA124_CLK_I2CSLOW 81 #define TEGRA124_CLK_DSIB 82 #define TEGRA124_CLK_TSEC 83 -- 1.8.1.5 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 1/3] ARM: tegra: remove UART5/UARTE from tegra124.dtsi 2014-04-01 20:13 ` Stephen Warren @ 2014-04-14 20:53 ` Stephen Warren -1 siblings, 0 replies; 12+ messages in thread From: Stephen Warren @ 2014-04-14 20:53 UTC (permalink / raw) To: arm, Mike Turquette Cc: Peter De Schrijver, Laxman Dewangan, linux-arm-kernel, linux-tegra, Stephen Warren, stable On 04/01/2014 02:13 PM, Stephen Warren wrote: > From: Stephen Warren <swarren@nvidia.com> > > Tegra124 only has 4 UARTs. Parts of the documentation hint at a fifth > UART, but this appears to be left-over from earlier SoC documentation. > Remove the non-existent DT node for UART5. arm-soc maintainers, I'm hoping this will be applied as a fix for v3.15 through the arm-soc tree. Do you want me to send a pull request with the series? Patch 2/3 does touch files in drivers/clk; are you waiting for Mike's ack on it? It already has Peter's ack as Tegra clock driver maintainer. Thanks. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/3] ARM: tegra: remove UART5/UARTE from tegra124.dtsi @ 2014-04-14 20:53 ` Stephen Warren 0 siblings, 0 replies; 12+ messages in thread From: Stephen Warren @ 2014-04-14 20:53 UTC (permalink / raw) To: linux-arm-kernel On 04/01/2014 02:13 PM, Stephen Warren wrote: > From: Stephen Warren <swarren@nvidia.com> > > Tegra124 only has 4 UARTs. Parts of the documentation hint at a fifth > UART, but this appears to be left-over from earlier SoC documentation. > Remove the non-existent DT node for UART5. arm-soc maintainers, I'm hoping this will be applied as a fix for v3.15 through the arm-soc tree. Do you want me to send a pull request with the series? Patch 2/3 does touch files in drivers/clk; are you waiting for Mike's ack on it? It already has Peter's ack as Tegra clock driver maintainer. Thanks. ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2014-04-23 16:24 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-01 20:13 [PATCH 1/3] ARM: tegra: remove UART5/UARTE from tegra124.dtsi Stephen Warren
2014-04-01 20:13 ` Stephen Warren
[not found] ` <1396383197-5979-1-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2014-04-01 20:13 ` [PATCH 2/3] clk: tegra: remove non-existent clocks Stephen Warren
2014-04-01 20:13 ` Stephen Warren
2014-04-02 8:10 ` Peter De Schrijver
2014-04-02 8:10 ` Peter De Schrijver
[not found] ` <1396383197-5979-2-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2014-04-23 16:24 ` Stephen Warren
2014-04-23 16:24 ` Stephen Warren
2014-04-01 20:13 ` [PATCH 3/3] dt: tegra: remove non-existent clock IDs Stephen Warren
2014-04-01 20:13 ` Stephen Warren
2014-04-14 20:53 ` [PATCH 1/3] ARM: tegra: remove UART5/UARTE from tegra124.dtsi Stephen Warren
2014-04-14 20:53 ` Stephen Warren
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.