Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1228290

[PATCH v2 6/9] ARM: dts: Reorder Cygnus peripherals

Show all headers | View raw

Reorder all Cygnus peripherals based on base register addresses in
bcm-cygnus.dtsi

Signed-off-by: Ray Jui <rjui@broadcom.com>
Reviewed-by: Scott Branden <sbranden@broadcom.com>
---
 arch/arm/boot/dts/bcm-cygnus.dtsi | 56 +++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi
index 3d29b77..dfa9a3c 100644
--- a/arch/arm/boot/dts/bcm-cygnus.dtsi
+++ b/arch/arm/boot/dts/bcm-cygnus.dtsi
@@ -108,26 +108,14 @@
 			gpio-controller;
 		};
 
-		gpio_ccm: gpio@1800a000 {
-			compatible = "brcm,cygnus-ccm-gpio";
-			reg = <0x1800a000 0x50>,
-			      <0x0301d164 0x20>;
-			#gpio-cells = <2>;
-			gpio-controller;
-			interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-controller;
-		};
-
-		gpio_asiu: gpio@180a5000 {
-			compatible = "brcm,cygnus-asiu-gpio";
-			reg = <0x180a5000 0x668>;
-			#gpio-cells = <2>;
-			gpio-controller;
-
-			pinmux = <&pinctrl>;
-
-			interrupt-controller;
-			interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+		i2c0: i2c@18008000 {
+			compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c";
+			reg = <0x18008000 0x100>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>;
+			clock-frequency = <100000>;
+			status = "disabled";
 		};
 
 		wdt0: wdt@18009000 {
@@ -138,14 +126,14 @@
 			clock-names = "apb_pclk";
 		};
 
-		i2c0: i2c@18008000 {
-			compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c";
-			reg = <0x18008000 0x100>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>;
-			clock-frequency = <100000>;
-			status = "disabled";
+		gpio_ccm: gpio@1800a000 {
+			compatible = "brcm,cygnus-ccm-gpio";
+			reg = <0x1800a000 0x50>,
+			      <0x0301d164 0x20>;
+			#gpio-cells = <2>;
+			gpio-controller;
+			interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-controller;
 		};
 
 		i2c1: i2c@1800b000 {
@@ -255,5 +243,17 @@
 
 			brcm,nand-has-wp;
 		};
+
+		gpio_asiu: gpio@180a5000 {
+			compatible = "brcm,cygnus-asiu-gpio";
+			reg = <0x180a5000 0x668>;
+			#gpio-cells = <2>;
+			gpio-controller;
+
+			pinmux = <&pinctrl>;
+
+			interrupt-controller;
+			interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+		};
 	};
 };
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/9] Broadcom Cygnus device tree changes Ray Jui <rjui@broadcom.com> - 2015-09-18 23:30 +0200
  [PATCH v2 2/9] ARM: dts: Use label for device nodes in Cygnus dts Ray Jui <rjui@broadcom.com> - 2015-09-18 23:30 +0200
  [PATCH v2 4/9] ARM: dts: Put Cygnus core components under core bus Ray Jui <rjui@broadcom.com> - 2015-09-18 23:30 +0200
    Re: [PATCH v2 4/9] ARM: dts: Put Cygnus core components under core bus Arnd Bergmann <arnd@arndb.de> - 2015-09-18 23:40 +0200
      Re: [PATCH v2 4/9] ARM: dts: Put Cygnus core components under core  bus Ray Jui <rjui@broadcom.com> - 2015-09-19 00:00 +0200
  [PATCH v2 8/9] ARM: dts: Enable NAND support on bcm911360_entphn Ray Jui <rjui@broadcom.com> - 2015-09-18 23:30 +0200
  [PATCH v2 7/9] ARM: dts: Enable various peripherals on bcm958305k Ray Jui <rjui@broadcom.com> - 2015-09-18 23:30 +0200
  Re: [PATCH v2 1/9] ARM: dts: consolidate aliases for Cygnus dt files Arnd Bergmann <arnd@arndb.de> - 2015-09-18 23:30 +0200
    Re: [PATCH v2 1/9] ARM: dts: consolidate aliases for Cygnus dt files Ray Jui <rjui@broadcom.com> - 2015-09-18 23:50 +0200
  [PATCH v2 6/9] ARM: dts: Reorder Cygnus peripherals Ray Jui <rjui@broadcom.com> - 2015-09-18 23:30 +0200
  [PATCH v2 9/9] ARM: dts: enable touchscreen support on Cygnus Ray Jui <rjui@broadcom.com> - 2015-09-18 23:30 +0200
  [PATCH v2 1/9] ARM: dts: consolidate aliases for Cygnus dt files Ray Jui <rjui@broadcom.com> - 2015-09-18 23:30 +0200

csiph-web