From 0834f9f07631a8857a96614e37cb21e1dc84ffb4 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 25 Feb 2016 10:14:05 +0000 Subject: brcm2708: remove linux 4.1 support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas SVN-Revision: 48766 --- ...c-bcm2708-BCM270X_DT-Add-support-for-I2C2.patch | 163 --------------------- 1 file changed, 163 deletions(-) delete mode 100644 target/linux/brcm2708/patches-4.1/0090-i2c-bcm2708-BCM270X_DT-Add-support-for-I2C2.patch (limited to 'target/linux/brcm2708/patches-4.1/0090-i2c-bcm2708-BCM270X_DT-Add-support-for-I2C2.patch') diff --git a/target/linux/brcm2708/patches-4.1/0090-i2c-bcm2708-BCM270X_DT-Add-support-for-I2C2.patch b/target/linux/brcm2708/patches-4.1/0090-i2c-bcm2708-BCM270X_DT-Add-support-for-I2C2.patch deleted file mode 100644 index b8f2726949..0000000000 --- a/target/linux/brcm2708/patches-4.1/0090-i2c-bcm2708-BCM270X_DT-Add-support-for-I2C2.patch +++ /dev/null @@ -1,163 +0,0 @@ -From 1f92859f2e0bebafa56d2247758909a23972ad46 Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Mon, 22 Jun 2015 14:23:03 +0100 -Subject: [PATCH 090/222] i2c-bcm2708/BCM270X_DT: Add support for I2C2 - -The third I2C bus (I2C2) is normally reserved for HDMI use. Careless -use of this bus can break an attached display - use with caution. - -It is recommended to disable accesses by VideoCore by setting -hdmi_ignore_edid=1 or hdmi_edid_file=1 in config.txt. - -The interface is disabled by default - enable using the -i2c2_iknowwhatimdoing DT parameter. ---- - arch/arm/boot/dts/bcm2708-rpi-b-plus.dts | 6 ++++++ - arch/arm/boot/dts/bcm2708-rpi-b.dts | 6 ++++++ - arch/arm/boot/dts/bcm2708-rpi-cm.dts | 6 ++++++ - arch/arm/boot/dts/bcm2708_common.dtsi | 14 ++++++++++++++ - arch/arm/boot/dts/bcm2709-rpi-2-b.dts | 6 ++++++ - drivers/i2c/busses/i2c-bcm2708.c | 5 ++++- - 6 files changed, 42 insertions(+), 1 deletion(-) - ---- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts -+++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts -@@ -75,6 +75,10 @@ - clock-frequency = <100000>; - }; - -+&i2c2 { -+ clock-frequency = <100000>; -+}; -+ - &i2s { - #sound-dai-cells = <0>; - pinctrl-names = "default"; -@@ -103,8 +107,10 @@ - spi = <&spi0>,"status"; - i2c0 = <&i2c0>,"status"; - i2c1 = <&i2c1>,"status"; -+ i2c2_iknowwhatimdoing = <&i2c2>,"status"; - i2c0_baudrate = <&i2c0>,"clock-frequency:0"; - i2c1_baudrate = <&i2c1>,"clock-frequency:0"; -+ i2c2_baudrate = <&i2c2>,"clock-frequency:0"; - core_freq = <&clk_core>,"clock-frequency:0"; - - act_led_gpio = <&act_led>,"gpios:4"; ---- a/arch/arm/boot/dts/bcm2708-rpi-b.dts -+++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts -@@ -75,6 +75,10 @@ - clock-frequency = <100000>; - }; - -+&i2c2 { -+ clock-frequency = <100000>; -+}; -+ - &i2s { - #sound-dai-cells = <0>; - pinctrl-names = "default"; -@@ -97,8 +101,10 @@ - spi = <&spi0>,"status"; - i2c0 = <&i2c0>,"status"; - i2c1 = <&i2c1>,"status"; -+ i2c2_iknowwhatimdoing = <&i2c2>,"status"; - i2c0_baudrate = <&i2c0>,"clock-frequency:0"; - i2c1_baudrate = <&i2c1>,"clock-frequency:0"; -+ i2c2_baudrate = <&i2c2>,"clock-frequency:0"; - core_freq = <&clk_core>,"clock-frequency:0"; - - act_led_gpio = <&act_led>,"gpios:4"; ---- a/arch/arm/boot/dts/bcm2708-rpi-cm.dts -+++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dts -@@ -65,6 +65,10 @@ - clock-frequency = <100000>; - }; - -+&i2c2 { -+ clock-frequency = <100000>; -+}; -+ - &i2s { - #sound-dai-cells = <0>; - pinctrl-names = "default"; -@@ -79,8 +83,10 @@ - spi = <&spi0>,"status"; - i2c0 = <&i2c0>,"status"; - i2c1 = <&i2c1>,"status"; -+ i2c2_iknowwhatimdoing = <&i2c2>,"status"; - i2c0_baudrate = <&i2c0>,"clock-frequency:0"; - i2c1_baudrate = <&i2c1>,"clock-frequency:0"; -+ i2c2_baudrate = <&i2c2>,"clock-frequency:0"; - core_freq = <&clk_core>,"clock-frequency:0"; - }; - }; ---- a/arch/arm/boot/dts/bcm2708_common.dtsi -+++ b/arch/arm/boot/dts/bcm2708_common.dtsi -@@ -20,6 +20,7 @@ - uart1 = &uart1; - mmc = &mmc; - i2c1 = &i2c1; -+ i2c2 = &i2c2; - usb = &usb; - leds = &leds; - fb = &fb; -@@ -179,6 +180,19 @@ - interrupts = <2 21>; - clocks = <&clk_i2c>; - #address-cells = <1>; -+ #size-cells = <0>; -+ status = "disabled"; -+ }; -+ -+ i2c2: i2c@7e805000 { -+ // Beware - this is shared with the HDMI module. -+ // Careless use may break (really) your display. -+ // Caveat emptor. -+ compatible = "brcm,bcm2708-i2c"; -+ reg = <0x7e805000 0x1000>; -+ interrupts = <2 21>; -+ clocks = <&clk_i2c>; -+ #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - }; ---- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts -+++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts -@@ -75,6 +75,10 @@ - clock-frequency = <100000>; - }; - -+&i2c2 { -+ clock-frequency = <100000>; -+}; -+ - &i2s { - #sound-dai-cells = <0>; - pinctrl-names = "default"; -@@ -103,8 +107,10 @@ - spi = <&spi0>,"status"; - i2c0 = <&i2c0>,"status"; - i2c1 = <&i2c1>,"status"; -+ i2c2_iknowwhatimdoing = <&i2c2>,"status"; - i2c0_baudrate = <&i2c0>,"clock-frequency:0"; - i2c1_baudrate = <&i2c1>,"clock-frequency:0"; -+ i2c2_baudrate = <&i2c2>,"clock-frequency:0"; - core_freq = <&clk_core>,"clock-frequency:0"; - - act_led_gpio = <&act_led>,"gpios:4"; ---- a/drivers/i2c/busses/i2c-bcm2708.c -+++ b/drivers/i2c/busses/i2c-bcm2708.c -@@ -407,8 +407,11 @@ static int bcm2708_i2c_probe(struct plat - case 1: - adap->class = I2C_CLASS_DDC; - break; -+ case 2: -+ adap->class = I2C_CLASS_DDC; -+ break; - default: -- dev_err(&pdev->dev, "can only bind to BSC 0 or 1\n"); -+ dev_err(&pdev->dev, "can only bind to BSC 0, 1 or 2\n"); - err = -ENXIO; - goto out_free_bi; - } -- cgit v1.2.3