diff options
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/tegra114-dalmore.dts | 13 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra114-pluto.dts | 13 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra114.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20-colibri-512.dtsi | 15 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20-harmony.dts | 17 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20-paz00.dts | 15 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20-seaboard.dts | 15 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20-tamonten.dtsi | 15 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20-trimslice.dts | 15 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20-ventana.dts | 15 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20-whistler.dts | 14 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra30-beaver.dts | 15 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra30-cardhu.dtsi | 15 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra30.dtsi | 6 | 
15 files changed, 179 insertions, 12 deletions
diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts index a30aca62658..6ebc1b70419 100644 --- a/arch/arm/boot/dts/tegra114-dalmore.dts +++ b/arch/arm/boot/dts/tegra114-dalmore.dts @@ -18,4 +18,17 @@  	pmc {  		nvidia,invert-interrupt;  	}; + +	clocks { +		compatible = "simple-bus"; +		#address-cells = <1>; +		#size-cells = <0>; + +		clk32k_in: clock { +			compatible = "fixed-clock"; +			reg=<0>; +			#clock-cells = <0>; +			clock-frequency = <32768>; +		}; +	};  }; diff --git a/arch/arm/boot/dts/tegra114-pluto.dts b/arch/arm/boot/dts/tegra114-pluto.dts index 9bea8f57aa4..5deb8692b35 100644 --- a/arch/arm/boot/dts/tegra114-pluto.dts +++ b/arch/arm/boot/dts/tegra114-pluto.dts @@ -18,4 +18,17 @@  	pmc {  		nvidia,invert-interrupt;  	}; + +	clocks { +		compatible = "simple-bus"; +		#address-cells = <1>; +		#size-cells = <0>; + +		clk32k_in: clock { +			compatible = "fixed-clock"; +			reg=<0>; +			#clock-cells = <0>; +			clock-frequency = <32768>; +		}; +	};  }; diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi index 1dfaf2874c5..c0b527d15fd 100644 --- a/arch/arm/boot/dts/tegra114.dtsi +++ b/arch/arm/boot/dts/tegra114.dtsi @@ -99,8 +99,10 @@  	};  	pmc { -		compatible = "nvidia,tegra114-pmc", "nvidia,tegra30-pmc"; +		compatible = "nvidia,tegra114-pmc";  		reg = <0x7000e400 0x400>; +		clocks = <&tegra_car 261>, <&clk32k_in>; +		clock-names = "pclk", "clk32k_in";  	};  	iommu { diff --git a/arch/arm/boot/dts/tegra20-colibri-512.dtsi b/arch/arm/boot/dts/tegra20-colibri-512.dtsi index 44416209004..4e3afdef28a 100644 --- a/arch/arm/boot/dts/tegra20-colibri-512.dtsi +++ b/arch/arm/boot/dts/tegra20-colibri-512.dtsi @@ -444,7 +444,20 @@  	};  	sdhci@c8000600 { -		cd-gpios = <&gpio 23 0>; /* gpio PC7 */ +		cd-gpios = <&gpio 23 1>; /* gpio PC7 */ +	}; + +	clocks { +		compatible = "simple-bus"; +		#address-cells = <1>; +		#size-cells = <0>; + +		clk32k_in: clock { +			compatible = "fixed-clock"; +			reg=<0>; +			#clock-cells = <0>; +			clock-frequency = <32768>; +		};  	};  	sound { diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts index 61d027f0361..ae9d5a20834 100644 --- a/arch/arm/boot/dts/tegra20-harmony.dts +++ b/arch/arm/boot/dts/tegra20-harmony.dts @@ -437,7 +437,7 @@  	sdhci@c8000200 {  		status = "okay"; -		cd-gpios = <&gpio 69 0>; /* gpio PI5 */ +		cd-gpios = <&gpio 69 1>; /* gpio PI5 */  		wp-gpios = <&gpio 57 0>; /* gpio PH1 */  		power-gpios = <&gpio 155 0>; /* gpio PT3 */  		bus-width = <4>; @@ -445,12 +445,25 @@  	sdhci@c8000600 {  		status = "okay"; -		cd-gpios = <&gpio 58 0>; /* gpio PH2 */ +		cd-gpios = <&gpio 58 1>; /* gpio PH2 */  		wp-gpios = <&gpio 59 0>; /* gpio PH3 */  		power-gpios = <&gpio 70 0>; /* gpio PI6 */  		bus-width = <8>;  	}; +	clocks { +		compatible = "simple-bus"; +		#address-cells = <1>; +		#size-cells = <0>; + +		clk32k_in: clock { +			compatible = "fixed-clock"; +			reg=<0>; +			#clock-cells = <0>; +			clock-frequency = <32768>; +		}; +	}; +  	kbc {  		status = "okay";  		nvidia,debounce-delay-ms = <2>; diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts index 54d6fce00a5..fd60940e406 100644 --- a/arch/arm/boot/dts/tegra20-paz00.dts +++ b/arch/arm/boot/dts/tegra20-paz00.dts @@ -436,7 +436,7 @@  	sdhci@c8000000 {  		status = "okay"; -		cd-gpios = <&gpio 173 0>; /* gpio PV5 */ +		cd-gpios = <&gpio 173 1>; /* gpio PV5 */  		wp-gpios = <&gpio 57 0>;  /* gpio PH1 */  		power-gpios = <&gpio 169 0>; /* gpio PV1 */  		bus-width = <4>; @@ -447,6 +447,19 @@  		bus-width = <8>;  	}; +	clocks { +		compatible = "simple-bus"; +		#address-cells = <1>; +		#size-cells = <0>; + +		clk32k_in: clock { +			compatible = "fixed-clock"; +			reg=<0>; +			#clock-cells = <0>; +			clock-frequency = <32768>; +		}; +	}; +  	gpio-keys {  		compatible = "gpio-keys"; diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts index 37b3a57ec0f..4ee700a33ca 100644 --- a/arch/arm/boot/dts/tegra20-seaboard.dts +++ b/arch/arm/boot/dts/tegra20-seaboard.dts @@ -584,7 +584,7 @@  	sdhci@c8000400 {  		status = "okay"; -		cd-gpios = <&gpio 69 0>; /* gpio PI5 */ +		cd-gpios = <&gpio 69 1>; /* gpio PI5 */  		wp-gpios = <&gpio 57 0>; /* gpio PH1 */  		power-gpios = <&gpio 70 0>; /* gpio PI6 */  		bus-width = <4>; @@ -595,6 +595,19 @@  		bus-width = <8>;  	}; +	clocks { +		compatible = "simple-bus"; +		#address-cells = <1>; +		#size-cells = <0>; + +		clk32k_in: clock { +			compatible = "fixed-clock"; +			reg=<0>; +			#clock-cells = <0>; +			clock-frequency = <32768>; +		}; +	}; +  	gpio-keys {  		compatible = "gpio-keys"; diff --git a/arch/arm/boot/dts/tegra20-tamonten.dtsi b/arch/arm/boot/dts/tegra20-tamonten.dtsi index 4766abae7a7..c1902572591 100644 --- a/arch/arm/boot/dts/tegra20-tamonten.dtsi +++ b/arch/arm/boot/dts/tegra20-tamonten.dtsi @@ -465,12 +465,25 @@  	};  	sdhci@c8000600 { -		cd-gpios = <&gpio 58 0>; /* gpio PH2 */ +		cd-gpios = <&gpio 58 1>; /* gpio PH2 */  		wp-gpios = <&gpio 59 0>; /* gpio PH3 */  		bus-width = <4>;  		status = "okay";  	}; +	clocks { +		compatible = "simple-bus"; +		#address-cells = <1>; +		#size-cells = <0>; + +		clk32k_in: clock { +			compatible = "fixed-clock"; +			reg=<0>; +			#clock-cells = <0>; +			clock-frequency = <32768>; +		}; +	}; +  	regulators {  		compatible = "simple-bus"; diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts index 5d79e4fc49a..a9f3f06580f 100644 --- a/arch/arm/boot/dts/tegra20-trimslice.dts +++ b/arch/arm/boot/dts/tegra20-trimslice.dts @@ -325,11 +325,24 @@  	sdhci@c8000600 {  		status = "okay"; -		cd-gpios = <&gpio 121 0>; /* gpio PP1 */ +		cd-gpios = <&gpio 121 1>; /* gpio PP1 */  		wp-gpios = <&gpio 122 0>; /* gpio PP2 */  		bus-width = <4>;  	}; +	clocks { +		compatible = "simple-bus"; +		#address-cells = <1>; +		#size-cells = <0>; + +		clk32k_in: clock { +			compatible = "fixed-clock"; +			reg=<0>; +			#clock-cells = <0>; +			clock-frequency = <32768>; +		}; +	}; +  	poweroff {  		compatible = "gpio-poweroff";  		gpios = <&gpio 191 1>; /* gpio PX7, active low */ diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts index 425c89000c2..f544806e961 100644 --- a/arch/arm/boot/dts/tegra20-ventana.dts +++ b/arch/arm/boot/dts/tegra20-ventana.dts @@ -520,7 +520,7 @@  	sdhci@c8000400 {  		status = "okay"; -		cd-gpios = <&gpio 69 0>; /* gpio PI5 */ +		cd-gpios = <&gpio 69 1>; /* gpio PI5 */  		wp-gpios = <&gpio 57 0>; /* gpio PH1 */  		power-gpios = <&gpio 70 0>; /* gpio PI6 */  		bus-width = <4>; @@ -531,6 +531,19 @@  		bus-width = <8>;  	}; +	clocks { +		compatible = "simple-bus"; +		#address-cells = <1>; +		#size-cells = <0>; + +		clk32k_in: clock { +			compatible = "fixed-clock"; +			reg=<0>; +			#clock-cells = <0>; +			clock-frequency = <32768>; +		}; +	}; +  	regulators {  		compatible = "simple-bus";  		#address-cells = <1>; diff --git a/arch/arm/boot/dts/tegra20-whistler.dts b/arch/arm/boot/dts/tegra20-whistler.dts index ea57c0f6dcc..258cf945f51 100644 --- a/arch/arm/boot/dts/tegra20-whistler.dts +++ b/arch/arm/boot/dts/tegra20-whistler.dts @@ -510,6 +510,7 @@  	sdhci@c8000400 {  		status = "okay"; +		cd-gpios = <&gpio 69 1>; /* gpio PI5 */  		wp-gpios = <&gpio 173 0>; /* gpio PV5 */  		bus-width = <8>;  	}; @@ -519,6 +520,19 @@  		bus-width = <8>;  	}; +	clocks { +		compatible = "simple-bus"; +		#address-cells = <1>; +		#size-cells = <0>; + +		clk32k_in: clock { +			compatible = "fixed-clock"; +			reg=<0>; +			#clock-cells = <0>; +			clock-frequency = <32768>; +		}; +	}; +  	kbc {  		status = "okay";  		nvidia,debounce-delay-ms = <20>; diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi index 3d3f64d2111..fc7febc2b38 100644 --- a/arch/arm/boot/dts/tegra20.dtsi +++ b/arch/arm/boot/dts/tegra20.dtsi @@ -145,6 +145,7 @@  			      0 1 0x04  			      0 41 0x04  			      0 42 0x04>; +		clocks = <&tegra_car 5>;  	};  	tegra_car: clock { @@ -304,6 +305,7 @@  		compatible = "nvidia,tegra20-rtc";  		reg = <0x7000e000 0x100>;  		interrupts = <0 2 0x04>; +		clocks = <&tegra_car 4>;  	};  	i2c@7000c000 { @@ -416,6 +418,8 @@  	pmc {  		compatible = "nvidia,tegra20-pmc";  		reg = <0x7000e400 0x400>; +		clocks = <&tegra_car 110>, <&clk32k_in>; +		clock-names = "pclk", "clk32k_in";  	};  	memory-controller@7000f000 { diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts index 8ff2ff20e4a..6248b2445b3 100644 --- a/arch/arm/boot/dts/tegra30-beaver.dts +++ b/arch/arm/boot/dts/tegra30-beaver.dts @@ -257,7 +257,7 @@  	sdhci@78000000 {  		status = "okay"; -		cd-gpios = <&gpio 69 0>; /* gpio PI5 */ +		cd-gpios = <&gpio 69 1>; /* gpio PI5 */  		wp-gpios = <&gpio 155 0>; /* gpio PT3 */  		power-gpios = <&gpio 31 0>; /* gpio PD7 */  		bus-width = <4>; @@ -268,6 +268,19 @@  		bus-width = <8>;  	}; +	clocks { +		compatible = "simple-bus"; +		#address-cells = <1>; +		#size-cells = <0>; + +		clk32k_in: clock { +			compatible = "fixed-clock"; +			reg=<0>; +			#clock-cells = <0>; +			clock-frequency = <32768>; +		}; +	}; +  	regulators {  		compatible = "simple-bus";  		#address-cells = <1>; diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi index 17499272a4e..65bf2b63174 100644 --- a/arch/arm/boot/dts/tegra30-cardhu.dtsi +++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi @@ -311,7 +311,7 @@  	sdhci@78000000 {  		status = "okay"; -		cd-gpios = <&gpio 69 0>; /* gpio PI5 */ +		cd-gpios = <&gpio 69 1>; /* gpio PI5 */  		wp-gpios = <&gpio 155 0>; /* gpio PT3 */  		power-gpios = <&gpio 31 0>; /* gpio PD7 */  		bus-width = <4>; @@ -322,6 +322,19 @@  		bus-width = <8>;  	}; +	clocks { +		compatible = "simple-bus"; +		#address-cells = <1>; +		#size-cells = <0>; + +		clk32k_in: clock { +			compatible = "fixed-clock"; +			reg=<0>; +			#clock-cells = <0>; +			clock-frequency = <32768>; +		}; +	}; +  	regulators {  		compatible = "simple-bus";  		#address-cells = <1>; diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi index dbf46c27256..9fe7a92b4c8 100644 --- a/arch/arm/boot/dts/tegra30.dtsi +++ b/arch/arm/boot/dts/tegra30.dtsi @@ -148,6 +148,7 @@  			      0 42 0x04  			      0 121 0x04  			      0 122 0x04>; +		clocks = <&tegra_car 5>;  	};  	tegra_car: clock { @@ -291,6 +292,7 @@  		compatible = "nvidia,tegra30-rtc", "nvidia,tegra20-rtc";  		reg = <0x7000e000 0x100>;  		interrupts = <0 2 0x04>; +		clocks = <&tegra_car 4>;  	};  	i2c@7000c000 { @@ -423,8 +425,10 @@  	};  	pmc { -		compatible = "nvidia,tegra20-pmc", "nvidia,tegra30-pmc"; +		compatible = "nvidia,tegra30-pmc";  		reg = <0x7000e400 0x400>; +		clocks = <&tegra_car 218>, <&clk32k_in>; +		clock-names = "pclk", "clk32k_in";  	};  	memory-controller {  |