Commit 6ad8ebff authored by Mark Brown's avatar Mark Brown Committed by Kukjin Kim
Browse files

ARM: dts: Disable I2C controllers by default on Exynos5250 



Ensure that unused I2C controllers are not activated, causing problems due
to inappropriate pinmuxing or similar, by marking the controllers as
disabled by default and requiring boards to explicitly enable those that
are in use.

Signed-off-by: default avatarMark Brown <broonie@linaro.org>
Acked-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent fae93f7c

arch/arm/boot/dts/cros5250-common.dtsi

+8 −4
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ 
	};

	};





	i2c@12C60000 {

	i2c@12C60000 {

		status = "okay";

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-max-bus-freq = <378000>;

		samsung,i2c-max-bus-freq = <378000>;
@@ -173,6 +174,7 @@ 
	};

	};





	i2c@12C70000 {

	i2c@12C70000 {

		status = "okay";

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-max-bus-freq = <378000>;

		samsung,i2c-max-bus-freq = <378000>;
@@ -186,6 +188,7 @@ 
	};

	};





	i2c@12C80000 {

	i2c@12C80000 {

		status = "okay";

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-max-bus-freq = <66000>;

		samsung,i2c-max-bus-freq = <66000>;
@@ -196,30 +199,31 @@ 
	};

	};





	i2c@12C90000 {

	i2c@12C90000 {

		status = "okay";

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-max-bus-freq = <66000>;

		samsung,i2c-max-bus-freq = <66000>;

	};

	};





	i2c@12CA0000 {

	i2c@12CA0000 {

		status = "okay";

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-max-bus-freq = <66000>;

		samsung,i2c-max-bus-freq = <66000>;

	};

	};





	i2c@12CB0000 {

	i2c@12CB0000 {

		status = "okay";

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-max-bus-freq = <66000>;

		samsung,i2c-max-bus-freq = <66000>;

	};

	};





	i2c@12CC0000 {

		status = "disabled";

	};



	i2c@12CD0000 {

	i2c@12CD0000 {

		status = "okay";

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-max-bus-freq = <66000>;

		samsung,i2c-max-bus-freq = <66000>;

	};

	};





	i2c@12CE0000 {

	i2c@12CE0000 {

		status = "okay";

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-max-bus-freq = <378000>;

		samsung,i2c-max-bus-freq = <378000>;

arch/arm/boot/dts/exynos5250-arndale.dts

+8 −24
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ 
		samsung,i2c-sda-delay = <100>;

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-max-bus-freq = <20000>;

		samsung,i2c-max-bus-freq = <20000>;

		samsung,i2c-slave-addr = <0x66>;

		samsung,i2c-slave-addr = <0x66>;

		status = "okay";





		s5m8767_pmic@66 {

		s5m8767_pmic@66 {

			compatible = "samsung,s5m8767-pmic";

			compatible = "samsung,s5m8767-pmic";
@@ -321,11 +322,9 @@ 
		};

		};

	};

	};





	i2c@12C70000 {

		status = "disabled";

	};



	i2c@12C80000 {

	i2c@12C80000 {

		status = "okay";



		samsung,i2c-sda-delay = <100>;

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-max-bus-freq = <66000>;

		samsung,i2c-max-bus-freq = <66000>;

		samsung,i2c-slave-addr = <0x50>;

		samsung,i2c-slave-addr = <0x50>;
@@ -337,7 +336,10 @@ 
	};

	};





	i2c@12C90000 {

	i2c@12C90000 {

		status = "okay";



		wm1811a@1a {

		wm1811a@1a {



			compatible = "wlf,wm1811";

			compatible = "wlf,wm1811";

			reg = <0x1a>;

			reg = <0x1a>;
@@ -355,23 +357,9 @@ 
		};

		};

	};

	};





	i2c@12CA0000 {

		status = "disabled";

	};



	i2c@12CB0000 {

		status = "disabled";

	};



	i2c@12CC0000 {

		status = "disabled";

	};



	i2c@12CD0000 {

		status = "disabled";

	};



	i2c@12CE0000 {

	i2c@12CE0000 {

		status = "okay";



		samsung,i2c-sda-delay = <100>;

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-max-bus-freq = <66000>;

		samsung,i2c-max-bus-freq = <66000>;

		samsung,i2c-slave-addr = <0x38>;

		samsung,i2c-slave-addr = <0x38>;
@@ -382,10 +370,6 @@ 
		};

		};

	};

	};





	i2c@121D0000 {

		status = "disabled";

	};



	mmc_0: mmc@12200000 {

	mmc_0: mmc@12200000 {

		status = "okay";

		status = "okay";

		num-slots = <1>;

		num-slots = <1>;

arch/arm/boot/dts/exynos5250-smdk5250.dts

+5 −20
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ 
	i2c@12C60000 {

	i2c@12C60000 {

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-max-bus-freq = <20000>;

		samsung,i2c-max-bus-freq = <20000>;

		status = "okay";





		eeprom@50 {

		eeprom@50 {

			compatible = "samsung,s524ad0xd1";

			compatible = "samsung,s524ad0xd1";
@@ -64,6 +65,7 @@ 
	i2c@12C70000 {

	i2c@12C70000 {

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-max-bus-freq = <20000>;

		samsung,i2c-max-bus-freq = <20000>;

		status = "okay";





		eeprom@51 {

		eeprom@51 {

			compatible = "samsung,s524ad0xd1";

			compatible = "samsung,s524ad0xd1";
@@ -92,6 +94,7 @@ 
		samsung,i2c-sda-delay = <100>;

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-max-bus-freq = <40000>;

		samsung,i2c-max-bus-freq = <40000>;

		samsung,i2c-slave-addr = <0x38>;

		samsung,i2c-slave-addr = <0x38>;

		status = "okay";





		sata-phy {

		sata-phy {

			compatible = "samsung,sata-phy";

			compatible = "samsung,sata-phy";
@@ -106,6 +109,7 @@ 
	i2c@12C80000 {

	i2c@12C80000 {

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-max-bus-freq = <66000>;

		samsung,i2c-max-bus-freq = <66000>;

		status = "okay";





		hdmiddc@50 {

		hdmiddc@50 {

			compatible = "samsung,exynos4210-hdmiddc";

			compatible = "samsung,exynos4210-hdmiddc";
@@ -113,29 +117,10 @@ 
		};

		};

	};

	};





	i2c@12C90000 {

		status = "disabled";

	};



	i2c@12CA0000 {

		status = "disabled";

	};



	i2c@12CB0000 {

		status = "disabled";

	};



	i2c@12CC0000 {

		status = "disabled";

	};



	i2c@12CD0000 {

		status = "disabled";

	};



	i2c@12CE0000 {

	i2c@12CE0000 {

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-max-bus-freq = <66000>;

		samsung,i2c-max-bus-freq = <66000>;

		status = "okay";





		hdmiphy@38 {

		hdmiphy@38 {

			compatible = "samsung,exynos4212-hdmiphy";

			compatible = "samsung,exynos4212-hdmiphy";

arch/arm/boot/dts/exynos5250.dtsi

+10 −0
Original line number Original line Diff line number Diff line
@@ -244,6 +244,7 @@ 
		clock-names = "i2c";

		clock-names = "i2c";

		pinctrl-names = "default";

		pinctrl-names = "default";

		pinctrl-0 = <&i2c0_bus>;

		pinctrl-0 = <&i2c0_bus>;

		status = "disabled";

	};

	};





	i2c_1: i2c@12C70000 {

	i2c_1: i2c@12C70000 {
@@ -256,6 +257,7 @@ 
		clock-names = "i2c";

		clock-names = "i2c";

		pinctrl-names = "default";

		pinctrl-names = "default";

		pinctrl-0 = <&i2c1_bus>;

		pinctrl-0 = <&i2c1_bus>;

		status = "disabled";

	};

	};





	i2c_2: i2c@12C80000 {

	i2c_2: i2c@12C80000 {
@@ -268,6 +270,7 @@ 
		clock-names = "i2c";

		clock-names = "i2c";

		pinctrl-names = "default";

		pinctrl-names = "default";

		pinctrl-0 = <&i2c2_bus>;

		pinctrl-0 = <&i2c2_bus>;

		status = "disabled";

	};

	};





	i2c_3: i2c@12C90000 {

	i2c_3: i2c@12C90000 {
@@ -280,6 +283,7 @@ 
		clock-names = "i2c";

		clock-names = "i2c";

		pinctrl-names = "default";

		pinctrl-names = "default";

		pinctrl-0 = <&i2c3_bus>;

		pinctrl-0 = <&i2c3_bus>;

		status = "disabled";

	};

	};





	i2c_4: i2c@12CA0000 {

	i2c_4: i2c@12CA0000 {
@@ -292,6 +296,7 @@ 
		clock-names = "i2c";

		clock-names = "i2c";

		pinctrl-names = "default";

		pinctrl-names = "default";

		pinctrl-0 = <&i2c4_bus>;

		pinctrl-0 = <&i2c4_bus>;

		status = "disabled";

	};

	};





	i2c_5: i2c@12CB0000 {

	i2c_5: i2c@12CB0000 {
@@ -304,6 +309,7 @@ 
		clock-names = "i2c";

		clock-names = "i2c";

		pinctrl-names = "default";

		pinctrl-names = "default";

		pinctrl-0 = <&i2c5_bus>;

		pinctrl-0 = <&i2c5_bus>;

		status = "disabled";

	};

	};





	i2c_6: i2c@12CC0000 {

	i2c_6: i2c@12CC0000 {
@@ -316,6 +322,7 @@ 
		clock-names = "i2c";

		clock-names = "i2c";

		pinctrl-names = "default";

		pinctrl-names = "default";

		pinctrl-0 = <&i2c6_bus>;

		pinctrl-0 = <&i2c6_bus>;

		status = "disabled";

	};

	};





	i2c_7: i2c@12CD0000 {

	i2c_7: i2c@12CD0000 {
@@ -328,6 +335,7 @@ 
		clock-names = "i2c";

		clock-names = "i2c";

		pinctrl-names = "default";

		pinctrl-names = "default";

		pinctrl-0 = <&i2c7_bus>;

		pinctrl-0 = <&i2c7_bus>;

		status = "disabled";

	};

	};





	i2c_8: i2c@12CE0000 {

	i2c_8: i2c@12CE0000 {
@@ -338,6 +346,7 @@ 
		#size-cells = <0>;

		#size-cells = <0>;

		clocks = <&clock 302>;

		clocks = <&clock 302>;

		clock-names = "i2c";

		clock-names = "i2c";

		status = "disabled";

	};

	};





	i2c@121D0000 {

	i2c@121D0000 {
@@ -347,6 +356,7 @@ 
                #size-cells = <0>;

                #size-cells = <0>;

		clocks = <&clock 288>;

		clocks = <&clock 288>;

		clock-names = "i2c";

		clock-names = "i2c";

		status = "disabled";

	};

	};





	spi_0: spi@12d20000 {

	spi_0: spi@12d20000 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE