ARM: nomadik: move GPIO I2C to S8815 board file (2096eb80) · Commits · 戴 / test

arch/arm/boot/dts/ste-nomadik-s8815.dts

+25 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,14 @@
		};
		};
		};
		gpioi2c {
		gpioi2c_default_mode: gpioi2c_default {
		gpioi2c_default_cfg {
		ste,pins = "GPIO73_C21", "GPIO74_C20";
		ste,input = <0>;
		};
		};
		};
		user-led {
		user_led_default_mode: user_led_default {
		user_led_default_cfg {
		@@ -65,6 +73,23 @@
		};
		};

		/* GPIO I2C connected to the USB portions of the STw4811 only */
		gpio-i2c {
		compatible = "i2c-gpio";
		gpios = <&gpio2 10 0>, /* sda */
		<&gpio2 9 0>; /* scl */
		#address-cells = <1>;
		#size-cells = <0>;
		pinctrl-names = "default";
		pinctrl-0 = <&gpioi2c_default_mode>;

		stw4811@2d {
		compatible = "st,stw4811-usb";
		reg = <0x2d>;
		};
		};


		/* Configure card detect for the uSD slot */
		amba {
		mmcsd: sdi@101f6000 {

+0 −24

Original line number	Diff line number	Diff line
		@@ -169,14 +169,6 @@
		};
		};
		};
		i2c2 {
		i2c2_default_mode: i2c2_default {
		i2c2_default_cfg {
		ste,pins = "GPIO73_C21", "GPIO74_C20";
		ste,input = <0>;
		};
		};
		};
		};

		src: src@101e0000 {
		@@ -747,22 +739,6 @@
		};
		};

		/* I2C2 connected to the USB portions of the STw4811 only */
		i2c2 {
		compatible = "i2c-gpio";
		gpios = <&gpio2 10 0>, /* sda */
		<&gpio2 9 0>; /* scl */
		#address-cells = <1>;
		#size-cells = <0>;
		pinctrl-names = "default";
		pinctrl-0 = <&i2c2_default_mode>;

		stw4811@2d {
		compatible = "st,stw4811-usb";
		reg = <0x2d>;
		};
		};

		amba {
		compatible = "arm,amba-bus";
		#address-cells = <1>;