From: andrew@lunn.ch (Andrew Lunn)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/4] arm: mvebu: indentation fixes for Armada 370/XP .dtsi files
Date: Sun, 6 Jan 2013 10:03:13 +0100 [thread overview]
Message-ID: <20130106090313.GP17242@lunn.ch> (raw)
In-Reply-To: <1357315498-4570-5-git-send-email-thomas.petazzoni@free-electrons.com>
On Fri, Jan 04, 2013 at 05:04:58PM +0100, Thomas Petazzoni wrote:
> The Armada 370 and Armada XP .dtsi files contained a mix of
> space-based and tabulation-based indentation, with not even the same
> width. This commit homogenize the indentation by using tabs everywhere
> and making the indentation level match the DT information level.
>
> The only non-whitespace change in this patch is the addition of a
> semi-colon at the end of the cpus { }; section in
> armada-xp-mv78230.dtsi.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> This is a fix for 3.8, should be pushed for some 3.8-rc.
Hi Thomas
White space changes are not fixes, so should not really be submitted
for 3.8-rc. Lets commit these as cleanup in 3.9.
I will however create and submit a patch to add the missing ;
Thanks
Andrew
> ---
> arch/arm/boot/dts/armada-370.dtsi | 8 ++--
> arch/arm/boot/dts/armada-xp-mv78230.dtsi | 30 +++++++--------
> arch/arm/boot/dts/armada-xp-mv78260.dtsi | 38 +++++++++---------
> arch/arm/boot/dts/armada-xp-mv78460.dtsi | 62 +++++++++++++++---------------
> arch/arm/boot/dts/armada-xp.dtsi | 44 ++++++++++-----------
> 5 files changed, 91 insertions(+), 91 deletions(-)
>
> diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
> index 636cf7d..a5c447d 100644
> --- a/arch/arm/boot/dts/armada-370.dtsi
> +++ b/arch/arm/boot/dts/armada-370.dtsi
> @@ -34,14 +34,14 @@
> };
>
> mpic: interrupt-controller at d0020000 {
> - reg = <0xd0020a00 0x1d0>,
> - <0xd0021870 0x58>;
> + reg = <0xd0020a00 0x1d0>,
> + <0xd0021870 0x58>;
> };
>
> soc {
> system-controller at d0018200 {
> - compatible = "marvell,armada-370-xp-system-controller";
> - reg = <0xd0018200 0x100>;
> + compatible = "marvell,armada-370-xp-system-controller";
> + reg = <0xd0018200 0x100>;
> };
>
> pinctrl {
> diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
> index 8f90fac..dff3750 100644
> --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
> +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
> @@ -25,23 +25,23 @@
> };
>
> cpus {
> - #address-cells = <1>;
> - #size-cells = <0>;
> + #address-cells = <1>;
> + #size-cells = <0>;
>
> - cpu at 0 {
> - device_type = "cpu";
> - compatible = "marvell,sheeva-v7";
> - reg = <0>;
> - clocks = <&cpuclk 0>;
> - };
> + cpu at 0 {
> + device_type = "cpu";
> + compatible = "marvell,sheeva-v7";
> + reg = <0>;
> + clocks = <&cpuclk 0>;
> + };
>
> - cpu at 1 {
> - device_type = "cpu";
> - compatible = "marvell,sheeva-v7";
> - reg = <1>;
> - clocks = <&cpuclk 1>;
> - };
> - }
> + cpu at 1 {
> + device_type = "cpu";
> + compatible = "marvell,sheeva-v7";
> + reg = <1>;
> + clocks = <&cpuclk 1>;
> + };
> + };
>
> soc {
> pinctrl {
> diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
> index 1c1937d..10511e6 100644
> --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
> +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
> @@ -26,22 +26,22 @@
> };
>
> cpus {
> - #address-cells = <1>;
> - #size-cells = <0>;
> + #address-cells = <1>;
> + #size-cells = <0>;
>
> - cpu at 0 {
> - device_type = "cpu";
> - compatible = "marvell,sheeva-v7";
> - reg = <0>;
> - clocks = <&cpuclk 0>;
> - };
> + cpu at 0 {
> + device_type = "cpu";
> + compatible = "marvell,sheeva-v7";
> + reg = <0>;
> + clocks = <&cpuclk 0>;
> + };
>
> - cpu at 1 {
> - device_type = "cpu";
> - compatible = "marvell,sheeva-v7";
> - reg = <1>;
> - clocks = <&cpuclk 1>;
> - };
> + cpu at 1 {
> + device_type = "cpu";
> + compatible = "marvell,sheeva-v7";
> + reg = <1>;
> + clocks = <&cpuclk 1>;
> + };
> };
>
> soc {
> @@ -87,11 +87,11 @@
> };
>
> ethernet at d0034000 {
> - compatible = "marvell,armada-370-neta";
> - reg = <0xd0034000 0x2500>;
> - interrupts = <14>;
> - clocks = <&gateclk 1>;
> - status = "disabled";
> + compatible = "marvell,armada-370-neta";
> + reg = <0xd0034000 0x2500>;
> + interrupts = <14>;
> + clocks = <&gateclk 1>;
> + status = "disabled";
> };
> };
> };
> diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
> index 4905cf3..c76a18b 100644
> --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
> +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
> @@ -27,36 +27,36 @@
>
>
> cpus {
> - #address-cells = <1>;
> - #size-cells = <0>;
> + #address-cells = <1>;
> + #size-cells = <0>;
>
> - cpu at 0 {
> - device_type = "cpu";
> - compatible = "marvell,sheeva-v7";
> - reg = <0>;
> - clocks = <&cpuclk 0>;
> - };
> + cpu at 0 {
> + device_type = "cpu";
> + compatible = "marvell,sheeva-v7";
> + reg = <0>;
> + clocks = <&cpuclk 0>;
> + };
>
> - cpu at 1 {
> - device_type = "cpu";
> - compatible = "marvell,sheeva-v7";
> - reg = <1>;
> - clocks = <&cpuclk 1>;
> - };
> + cpu at 1 {
> + device_type = "cpu";
> + compatible = "marvell,sheeva-v7";
> + reg = <1>;
> + clocks = <&cpuclk 1>;
> + };
>
> - cpu at 2 {
> - device_type = "cpu";
> - compatible = "marvell,sheeva-v7";
> - reg = <2>;
> - clocks = <&cpuclk 2>;
> - };
> + cpu at 2 {
> + device_type = "cpu";
> + compatible = "marvell,sheeva-v7";
> + reg = <2>;
> + clocks = <&cpuclk 2>;
> + };
>
> - cpu at 3 {
> - device_type = "cpu";
> - compatible = "marvell,sheeva-v7";
> - reg = <3>;
> - clocks = <&cpuclk 3>;
> - };
> + cpu at 3 {
> + device_type = "cpu";
> + compatible = "marvell,sheeva-v7";
> + reg = <3>;
> + clocks = <&cpuclk 3>;
> + };
> };
>
> soc {
> @@ -102,11 +102,11 @@
> };
>
> ethernet at d0034000 {
> - compatible = "marvell,armada-370-neta";
> - reg = <0xd0034000 0x2500>;
> - interrupts = <14>;
> - clocks = <&gateclk 1>;
> - status = "disabled";
> + compatible = "marvell,armada-370-neta";
> + reg = <0xd0034000 0x2500>;
> + interrupts = <14>;
> + clocks = <&gateclk 1>;
> + status = "disabled";
> };
> };
> };
> diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
> index 390ba98..95d43ec 100644
> --- a/arch/arm/boot/dts/armada-xp.dtsi
> +++ b/arch/arm/boot/dts/armada-xp.dtsi
> @@ -30,8 +30,8 @@
> };
>
> mpic: interrupt-controller at d0020000 {
> - reg = <0xd0020a00 0x2d0>,
> - <0xd0021070 0x58>;
> + reg = <0xd0020a00 0x2d0>,
> + <0xd0021070 0x58>;
> };
>
> armada-370-xp-pmsu at d0022000 {
> @@ -42,24 +42,24 @@
>
> soc {
> serial at d0012200 {
> - compatible = "snps,dw-apb-uart";
> - reg = <0xd0012200 0x100>;
> - reg-shift = <2>;
> - interrupts = <43>;
> - reg-io-width = <4>;
> - status = "disabled";
> + compatible = "snps,dw-apb-uart";
> + reg = <0xd0012200 0x100>;
> + reg-shift = <2>;
> + interrupts = <43>;
> + reg-io-width = <4>;
> + status = "disabled";
> };
> serial at d0012300 {
> - compatible = "snps,dw-apb-uart";
> - reg = <0xd0012300 0x100>;
> - reg-shift = <2>;
> - interrupts = <44>;
> - reg-io-width = <4>;
> - status = "disabled";
> + compatible = "snps,dw-apb-uart";
> + reg = <0xd0012300 0x100>;
> + reg-shift = <2>;
> + interrupts = <44>;
> + reg-io-width = <4>;
> + status = "disabled";
> };
>
> timer at d0020300 {
> - marvell,timer-25Mhz;
> + marvell,timer-25Mhz;
> };
>
> coreclk: mvebu-sar at d0018230 {
> @@ -83,16 +83,16 @@
> };
>
> system-controller at d0018200 {
> - compatible = "marvell,armada-370-xp-system-controller";
> - reg = <0xd0018200 0x500>;
> + compatible = "marvell,armada-370-xp-system-controller";
> + reg = <0xd0018200 0x500>;
> };
>
> ethernet at d0030000 {
> - compatible = "marvell,armada-370-neta";
> - reg = <0xd0030000 0x2500>;
> - interrupts = <12>;
> - clocks = <&gateclk 2>;
> - status = "disabled";
> + compatible = "marvell,armada-370-neta";
> + reg = <0xd0030000 0x2500>;
> + interrupts = <12>;
> + clocks = <&gateclk 2>;
> + status = "disabled";
> };
>
> xor at d0060900 {
> --
> 1.7.9.5
>
next prev parent reply other threads:[~2013-01-06 9:03 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-04 16:04 arm: mvebu: DT fixes for 3.8 Thomas Petazzoni
2013-01-04 16:04 ` [PATCH 1/4] arm: mvebu: limit OpenBlocks AX3-4 to 1 GB of RAM Thomas Petazzoni
2013-01-04 17:26 ` Andrew Lunn
2013-01-04 17:31 ` Thomas Petazzoni
2013-01-04 17:37 ` Andrew Lunn
2013-01-04 18:03 ` Thomas Petazzoni
2013-01-06 21:36 ` Gregory CLEMENT
2013-01-06 22:53 ` Thomas Petazzoni
2013-01-07 9:47 ` Andrew Lunn
2013-01-07 11:07 ` Andrew Lunn
2013-01-07 11:26 ` Thomas Petazzoni
2013-01-07 11:34 ` Andrew Lunn
2013-01-07 12:27 ` Gregory CLEMENT
2013-01-07 13:22 ` Andrew Lunn
2013-02-26 15:20 ` Thomas Petazzoni
2013-02-27 7:03 ` Andrew Lunn
2013-02-27 8:33 ` Thomas Petazzoni
2013-01-04 16:04 ` [PATCH 2/4] arm: mvebu: Armada XP MV78230 has two cores, not one Thomas Petazzoni
2013-01-04 16:04 ` [PATCH 3/4] arm: mvebu: Armada XP MV78230 has only three Ethernet interfaces Thomas Petazzoni
2013-01-04 16:04 ` [PATCH 4/4] arm: mvebu: indentation fixes for Armada 370/XP .dtsi files Thomas Petazzoni
2013-01-06 9:03 ` Andrew Lunn [this message]
2013-01-07 16:53 ` Thomas Petazzoni
2013-01-07 16:55 ` Jason Cooper
2013-01-07 17:04 ` Thomas Petazzoni
2013-01-07 17:08 ` Jason Cooper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130106090313.GP17242@lunn.ch \
--to=andrew@lunn.ch \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.