Merge tag 'arm-soc/for-4.3/dts' of http://github.com/broadcom/stblinux into next/dt

Merge "Broadcom Device Tree changes for 4.3 (part 1)" from Florian Fainelli:

This pull request contains two changes:

- Ray adds the relevant clocks device tree nodes for Cygnus SoCs

- Rafal enables UART0 on BCM5301X routers where it has been verified to work
  correctly

* tag 'arm-soc/for-4.3/dts' of http://github.com/broadcom/stblinux:
  ARM: BCM5301X: Enable UART0 on tested devices
  ARM: dts: enable clock support for Broadcom Cygnus

Signed-off-by: Olof Johansson <olof@lixom.net>

arch/arm/boot/dts/bcm-cygnus-clock.dtsi

@@ -36,56 +36,89 @@ clocks {
 	ranges;
 
 	osc: oscillator {
+		#clock-cells = <0>;
 		compatible = "fixed-clock";
-		#clock-cells = <1>;
 		clock-frequency = <25000000>;
 	};
 
+	/* Cygnus ARM PLL */
+	armpll: armpll {
+		#clock-cells = <0>;
+		compatible = "brcm,cygnus-armpll";
+		clocks = <&osc>;
+		reg = <0x19000000 0x1000>;
+	};
+
+	/* peripheral clock for system timer */
+	periph_clk: arm_periph_clk {
+		#clock-cells = <0>;
+		compatible = "fixed-factor-clock";
+		clocks = <&armpll>;
+		clock-div = <2>;
+		clock-mult = <1>;
+	};
+
+	/* APB bus clock */
 	apb_clk: apb_clk {
-		compatible = "fixed-clock";
 		#clock-cells = <0>;
-		clock-frequency = <1000000000>;
+		compatible = "fixed-factor-clock";
+		clocks = <&armpll>;
+		clock-div = <4>;
+		clock-mult = <1>;
 	};
 
-	periph_clk: periph_clk {
+	genpll: genpll {
-		compatible = "fixed-clock";
+		#clock-cells = <1>;
-		#clock-cells = <0>;
+		compatible = "brcm,cygnus-genpll";
-		clock-frequency = <500000000>;
+		reg = <0x0301d000 0x2c>, <0x0301c020 0x4>;
+		clocks = <&osc>;
+		clock-output-names = "genpll", "axi21", "250mhz", "ihost_sys",
+				     "enet_sw", "audio_125", "can";
 	};
 
-	sdio_clk: lcpll_ch2 {
+	/* always 1/2 of the axi21 clock */
-		compatible = "fixed-clock";
+	axi41_clk: axi41_clk {
 		#clock-cells = <0>;
-		clock-frequency = <200000000>;
+		compatible = "fixed-factor-clock";
+		clocks = <&genpll 1>;
+		clock-div = <2>;
+		clock-mult = <1>;
 	};
 
+	/* always 1/4 of the axi21 clock */
 	axi81_clk: axi81_clk {
-		compatible = "fixed-clock";
 		#clock-cells = <0>;
-		clock-frequency = <100000000>;
+		compatible = "fixed-factor-clock";
+		clocks = <&genpll 1>;
+		clock-div = <4>;
+		clock-mult = <1>;
 	};
 
-	keypad_clk: keypad_clk {
+	lcpll0: lcpll0 {
-		compatible = "fixed-clock";
+		#clock-cells = <1>;
-		#clock-cells = <0>;
+		compatible = "brcm,cygnus-lcpll0";
-		clock-frequency = <31806>;
+		reg = <0x0301d02c 0x1c>, <0x0301c020 0x4>;
+		clocks = <&osc>;
+		clock-output-names = "lcpll0", "pcie_phy", "ddr_phy", "sdio",
+				     "usb_phy", "smart_card", "ch5";
 	};
 
-	adc_clk: adc_clk {
+	mipipll: mipipll {
-		compatible = "fixed-clock";
+		#clock-cells = <1>;
-		#clock-cells = <0>;
+		compatible = "brcm,cygnus-mipipll";
-		clock-frequency = <1562500>;
+		reg = <0x180a9800 0x2c>, <0x0301c020 0x4>, <0x180aa024 0x4>;
+		clocks = <&osc>;
+		clock-output-names = "mipipll", "ch0_unused", "ch1_lcd",
+				     "ch2_v3d", "ch3_unused", "ch4_unused",
+				     "ch5_unused";
 	};
 
-	pwm_clk: pwm_clk {
+	asiu_clks: asiu_clks {
-		compatible = "fixed-clock";
+		#clock-cells = <1>;
-		#clock-cells = <0>;
+		compatible = "brcm,cygnus-asiu-clk";
-		clock-frequency = <1000000>;
+		reg = <0x0301d048 0xc>, <0x180aa024 0x4>;
-	};
 
-	lcd_clk: mipipll_ch1 {
+		clocks = <&osc>;
-		compatible = "fixed-clock";
+		clock-output-names = "keypad", "adc/touch", "pwm";
-		#clock-cells = <0>;
-		clock-frequency = <100000000>;
 	};
 };

arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts

@@ -135,3 +135,7 @@
 		};
 	};
 };
+
+&uart0 {
+	status = "okay";
+};

arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts

@@ -55,3 +55,7 @@
 		};
 	};
 };
+
+&uart0 {
+	status = "okay";
+};

arch/arm/boot/dts/bcm4708-netgear-r6250.dts

@@ -24,16 +24,6 @@
 		reg = <0x00000000 0x08000000>;
 	};
 
-	chipcommonA {
-		uart0: serial@0300 {
-			status = "okay";
-		};
-
-		uart1: serial@0400 {
-			status = "okay";
-		};
-	};
-
 	leds {
 		compatible = "gpio-leds";
 
@@ -92,3 +82,7 @@
 		};
 	};
 };
+
+&uart0 {
+	status = "okay";
+};

arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts

@@ -118,3 +118,7 @@
 		};
 	};
 };
+
+&uart0 {
+	status = "okay";
+};

arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts

@@ -122,3 +122,7 @@
 		};
 	};
 };
+
+&uart0 {
+	status = "okay";
+};