From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 31 Jan 2014 02:08:27 +0000 (-0800)
Subject: Merge tag 'late-dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Url: http://pileus.org/git/?p=~andy%2Flinux;a=commitdiff_plain;h=f8a504c404c6c4abbed4ae34fe1027ba3c24d035

Merge tag 'late-dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC late changes from Kevin Hilman:
 "These are changes that arrived a little late but were considered
  self-contained enough to still go in for v3.14.

  They are all device tree updtes this time around, and mainly for
  Broadcom SoCs"

* tag 'late-dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: moxart: move fixed rate clock child node to board level dts
  clk: bcm281xx: define kona clock binding
  ARM: dts: add usb udc support to bcm281xx
  ARM: dts: Specify clocks for timer on bcm11351
  Documentation: dt: kona-timer: Add clocks property
  ARM: dts: Specify clocks for SDHCIs on bcm11351
  Documentation: dt: kona-sdhci: Add clocks property
  ARM: dts: Specify clocks for UARTs on bcm11351
  ARM: dts: bcm281xx: Add i2c busses
  ARM: dts: Declare clocks as fixed on bcm11351
  ARM: dts: bcm28155-ap: Enable all the i2c busses
---

f8a504c404c6c4abbed4ae34fe1027ba3c24d035
diff --cc arch/arm/boot/dts/bcm11351.dtsi
index dd8e878741c,375a2f8eb87..e491b82f8d6
--- a/arch/arm/boot/dts/bcm11351.dtsi
+++ b/arch/arm/boot/dts/bcm11351.dtsi
@@@ -142,8 -146,159 +146,164 @@@
  		status = "disabled";
  	};
  
 +	pinctrl@35004800 {
 +		compatible = "brcm,capri-pinctrl";
 +		reg = <0x35004800 0x430>;
 +	};
++
+ 	i2c@3e016000 {
+ 		compatible = "brcm,bcm11351-i2c", "brcm,kona-i2c";
+ 		reg = <0x3e016000 0x80>;
+ 		interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 		clocks = <&bsc1_clk>;
+ 		status = "disabled";
+ 	};
+ 
+ 	i2c@3e017000 {
+ 		compatible = "brcm,bcm11351-i2c", "brcm,kona-i2c";
+ 		reg = <0x3e017000 0x80>;
+ 		interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 		clocks = <&bsc2_clk>;
+ 		status = "disabled";
+ 	};
+ 
+ 	i2c@3e018000 {
+ 		compatible = "brcm,bcm11351-i2c", "brcm,kona-i2c";
+ 		reg = <0x3e018000 0x80>;
+ 		interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 		clocks = <&bsc3_clk>;
+ 		status = "disabled";
+ 	};
+ 
+ 	i2c@3500d000 {
+ 		compatible = "brcm,bcm11351-i2c", "brcm,kona-i2c";
+ 		reg = <0x3500d000 0x80>;
+ 		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 		clocks = <&pmu_bsc_clk>;
+ 		status = "disabled";
+ 	};
+ 
+ 	clocks {
+ 		bsc1_clk: bsc1 {
+ 			compatible = "fixed-clock";
+ 			clock-frequency = <13000000>;
+ 			#clock-cells = <0>;
+ 		};
+ 
+ 		bsc2_clk: bsc2 {
+ 			compatible = "fixed-clock";
+ 			clock-frequency = <13000000>;
+ 			#clock-cells = <0>;
+ 		};
+ 
+ 		bsc3_clk: bsc3 {
+ 			compatible = "fixed-clock";
+ 			clock-frequency = <13000000>;
+ 			#clock-cells = <0>;
+ 		};
+ 
+ 		pmu_bsc_clk: pmu_bsc {
+ 			compatible = "fixed-clock";
+ 			clock-frequency = <13000000>;
+ 			#clock-cells = <0>;
+ 		};
+ 
+ 		hub_timer_clk: hub_timer {
+ 			compatible = "fixed-clock";
+ 			clock-frequency = <32768>;
+ 			#clock-cells = <0>;
+ 		};
+ 
+ 		pwm_clk: pwm {
+ 			compatible = "fixed-clock";
+ 			clock-frequency = <26000000>;
+ 			#clock-cells = <0>;
+ 		};
+ 
+ 		sdio1_clk: sdio1 {
+ 			compatible = "fixed-clock";
+ 			clock-frequency = <48000000>;
+ 			#clock-cells = <0>;
+ 		};
+ 
+ 		sdio2_clk: sdio2 {
+ 			compatible = "fixed-clock";
+ 			clock-frequency = <48000000>;
+ 			#clock-cells = <0>;
+ 		};
+ 
+ 		sdio3_clk: sdio3 {
+ 			compatible = "fixed-clock";
+ 			clock-frequency = <48000000>;
+ 			#clock-cells = <0>;
+ 		};
+ 
+ 		sdio4_clk: sdio4 {
+ 			compatible = "fixed-clock";
+ 			clock-frequency = <48000000>;
+ 			#clock-cells = <0>;
+ 		};
+ 
+ 		tmon_1m_clk: tmon_1m {
+ 			compatible = "fixed-clock";
+ 			clock-frequency = <1000000>;
+ 			#clock-cells = <0>;
+ 		};
+ 
+ 		uartb_clk: uartb {
+ 			compatible = "fixed-clock";
+ 			clock-frequency = <13000000>;
+ 			#clock-cells = <0>;
+ 		};
+ 
+ 		uartb2_clk: uartb2 {
+ 			compatible = "fixed-clock";
+ 			clock-frequency = <13000000>;
+ 			#clock-cells = <0>;
+ 		};
+ 
+ 		uartb3_clk: uartb3 {
+ 			compatible = "fixed-clock";
+ 			clock-frequency = <13000000>;
+ 			#clock-cells = <0>;
+ 		};
+ 
+ 		uartb4_clk: uartb4 {
+ 			compatible = "fixed-clock";
+ 			clock-frequency = <13000000>;
+ 			#clock-cells = <0>;
+ 		};
+ 
+ 		usb_otg_ahb_clk: usb_otg_ahb {
+ 			compatible = "fixed-clock";
+ 			clock-frequency = <52000000>;
+ 			#clock-cells = <0>;
+ 		};
+ 	};
+ 
+ 	usbotg: usb@3f120000 {
+ 		compatible = "snps,dwc2";
+ 		reg = <0x3f120000 0x10000>;
+ 		interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;
+ 		clocks = <&usb_otg_ahb_clk>;
+ 		clock-names = "otg";
+ 		phys = <&usbphy>;
+ 		phy-names = "usb2-phy";
+ 		status = "disabled";
+ 	};
+ 
+ 	usbphy: usb-phy@3f130000 {
+ 		compatible = "brcm,kona-usb2-phy";
+ 		reg = <0x3f130000 0x28>;
+ 		#phy-cells = <0>;
+ 		status = "disabled";
+ 	};
  };