diff --git a/recipes-kernel/linux/linux-raspberrypi-4.4/0018-Add-device-tree-support-for-raspberry-pi-3B.patch b/recipes-kernel/linux/linux-raspberrypi-4.4/0018-Add-device-tree-support-for-raspberry-pi-3B.patch deleted file mode 100644 index 2968780554a..00000000000 --- a/recipes-kernel/linux/linux-raspberrypi-4.4/0018-Add-device-tree-support-for-raspberry-pi-3B.patch +++ /dev/null @@ -1,261 +0,0 @@ -From d42ed8d5380c390b75895baf34d810e797a111ca Mon Sep 17 00:00:00 2001 -From: JeongBong Seo -Date: Wed, 27 Feb 2019 23:01:04 +0900 -Subject: Add device tree support for raspberry pi 3B+ - ---- - arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 201 +++++++++++++++++++++ - arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi | 36 ++++ - 2 files changed - create mode 100644 arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts - create mode 100644 arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi - -diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts -new file mode 100644 -index 000000000000..aced7dfa32ee ---- /dev/null -+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts -@@ -0,0 +1,201 @@ -+/dts-v1/; -+ -+#include "bcm2710.dtsi" -+#include "bcm283x-rpi-lan7515.dtsi" -+ -+/ { -+ compatible = "brcm,bcm2710","brcm,bcm2709"; -+ model = "Raspberry Pi 3 Model B+"; -+}; -+ -+&gpio { -+ sdhost_pins: sdhost_pins { -+ brcm,pins = <48 49 50 51 52 53>; -+ brcm,function = <4>; /* alt0 */ -+ }; -+ -+ spi0_pins: spi0_pins { -+ brcm,pins = <9 10 11>; -+ brcm,function = <4>; /* alt0 */ -+ }; -+ -+ spi0_cs_pins: spi0_cs_pins { -+ brcm,pins = <8 7>; -+ brcm,function = <1>; /* output */ -+ }; -+ -+ i2c0_pins: i2c0 { -+ brcm,pins = <0 1>; -+ brcm,function = <4>; -+ }; -+ -+ i2c1_pins: i2c1 { -+ brcm,pins = <2 3>; -+ brcm,function = <4>; -+ }; -+ -+ i2s_pins: i2s { -+ brcm,pins = <18 19 20 21>; -+ brcm,function = <4>; /* alt0 */ -+ }; -+ -+ sdio_pins: sdio_pins { -+ brcm,pins = <34 35 36 37 38 39>; -+ brcm,function = <7>; // alt3 = SD1 -+ brcm,pull = <0 2 2 2 2 2>; -+ }; -+ -+ bt_pins: bt_pins { -+ brcm,pins = <43>; -+ brcm,function = <4>; /* alt0:GPCLK2 */ -+ brcm,pull = <0>; -+ }; -+ -+ uart0_pins: uart0_pins { -+ brcm,pins = <32 33>; -+ brcm,function = <7>; /* alt3=UART0 */ -+ brcm,pull = <0 2>; -+ }; -+ -+ uart1_pins: uart1_pins { -+ brcm,pins; -+ brcm,function; -+ brcm,pull; -+ }; -+ -+ audio_pins: audio_pins { -+ brcm,pins = <40 41>; -+ brcm,function = <4>; -+ }; -+}; -+ -+&sdhost { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&sdhost_pins>; -+ bus-width = <4>; -+ status = "okay"; -+}; -+ -+&mmc { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&sdio_pins>; -+ non-removable; -+ bus-width = <4>; -+ status = "okay"; -+ brcm,overclock-50 = <0>; -+}; -+ -+&soc { -+}; -+ -+&fb { -+ status = "okay"; -+}; -+ -+&uart0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart0_pins &bt_pins>; -+ status = "okay"; -+}; -+ -+&uart1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart1_pins>; -+ status = "okay"; -+}; -+ -+&spi0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&spi0_pins &spi0_cs_pins>; -+ cs-gpios = <&gpio 8 1>, <&gpio 7 1>; -+ -+ spidev0: spidev@0{ -+ compatible = "spidev"; -+ reg = <0>; /* CE0 */ -+ #address-cells = <1>; -+ #size-cells = <0>; -+ spi-max-frequency = <500000>; -+ }; -+ -+ spidev1: spidev@1{ -+ compatible = "spidev"; -+ reg = <1>; /* CE1 */ -+ #address-cells = <1>; -+ #size-cells = <0>; -+ spi-max-frequency = <500000>; -+ }; -+}; -+ -+&i2c0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&i2c0_pins>; -+ clock-frequency = <100000>; -+}; -+ -+&i2c1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&i2c1_pins>; -+ clock-frequency = <100000>; -+}; -+ -+&i2c2 { -+ clock-frequency = <100000>; -+}; -+ -+&i2s { -+ #sound-dai-cells = <0>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&i2s_pins>; -+}; -+ -+&random { -+ status = "okay"; -+}; -+ -+&leds { -+ act_led: act { -+ label = "led0"; -+ linux,default-trigger = "mmc0"; -+ gpios = <&gpio 29 0>; -+ }; -+}; -+ -+&audio { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&audio_pins>; -+}; -+ -+/ { -+ chosen { -+ bootargs = "8250.nr_uarts=1"; -+ }; -+}; -+ -+/ { -+ __overrides__ { -+ uart0 = <&uart0>,"status"; -+ uart0_clkrate = <&clk_uart0>,"clock-frequency:0"; -+ uart1 = <&uart1>,"status"; -+ i2s = <&i2s>,"status"; -+ 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"; -+ act_led_activelow = <&act_led>,"gpios:8"; -+ act_led_trigger = <&act_led>,"linux,default-trigger"; -+ -+ audio = <&audio>,"status"; -+ watchdog = <&watchdog>,"status"; -+ random = <&random>,"status"; -+ sd_overclock = <&sdhost>,"brcm,overclock-50:0"; -+ sd_force_pio = <&sdhost>,"brcm,force-pio?"; -+ sd_pio_limit = <&sdhost>,"brcm,pio-limit:0"; -+ sd_debug = <&sdhost>,"brcm,debug"; -+ }; -+}; -diff --git a/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi -new file mode 100644 -index 000000000000..85f73348c0b7 ---- /dev/null -+++ b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi -@@ -0,0 +1,36 @@ -+/ { -+ aliases { -+ ethernet = ðernet; -+ }; -+}; -+ -+&usb { -+ usb1@1 { -+ compatible = "usb424,2514"; -+ reg = <1>; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ usb1_1@1 { -+ compatible = "usb424,2514"; -+ reg = <1>; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ ethernet: usbether@1 { -+ compatible = "usb424,7800"; -+ reg = <1>; -+ microchip,eee-enabled; -+ microchip,tx-lpi-timer = <600>; /* non-aggressive*/ -+ }; -+ }; -+ }; -+}; -+ -+ -+/ { -+ __overrides__ { -+ eee = <ðernet>,"microchip,eee-enabled?"; -+ tx_lpi_timer = <ðernet>,"microchip,tx-lpi-timer:0"; -+ }; -+}; diff --git a/recipes-kernel/linux/linux-raspberrypi-4.4/0019-lan78xx-Resolve-issue-with-changing-MAC-address.patch b/recipes-kernel/linux/linux-raspberrypi-4.4/0019-lan78xx-Resolve-issue-with-changing-MAC-address.patch deleted file mode 100644 index b1f736ab5c7..00000000000 --- a/recipes-kernel/linux/linux-raspberrypi-4.4/0019-lan78xx-Resolve-issue-with-changing-MAC-address.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 160704f1ee0d4adad032f83647be3605be36ad11 Mon Sep 17 00:00:00 2001 -From: JeongBong Seo -Date: Mon, 22 Apr 2019 10:20:53 +0900 -Subject: lan78xx: Resolve issue with changing MAC address - -Refers two patches from 4.19 - - lan78xx: Resolve issue with changing MAC address, Jason Martinsen - - lan78xx: Read MAC address from DT if present, Phil Elwell ---- - drivers/net/usb/lan78xx.c | 41 ++++++++++++++++++--------------------- - 1 file changed, 19 insertions(+), 22 deletions(-) - -diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c -index 226668ead0d8..8e1c96bb1ece 100644 ---- a/drivers/net/usb/lan78xx.c -+++ b/drivers/net/usb/lan78xx.c -@@ -1332,34 +1332,27 @@ static void lan78xx_init_mac_address(struct lan78xx_net *dev) - addr[5] = (addr_hi >> 8) & 0xFF; - - if (!is_valid_ether_addr(addr)) { -- /* reading mac address from EEPROM or OTP */ -- if ((lan78xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN, -- addr) == 0) || -- (lan78xx_read_otp(dev, EEPROM_MAC_OFFSET, ETH_ALEN, -- addr) == 0)) { -- if (is_valid_ether_addr(addr)) { -- /* eeprom values are valid so use them */ -- netif_dbg(dev, ifup, dev->net, -- "MAC address read from EEPROM"); -- } else { -- /* generate random MAC */ -- random_ether_addr(addr); -- netif_dbg(dev, ifup, dev->net, -- "MAC address set to random addr"); -- } -- -- addr_lo = addr[0] | (addr[1] << 8) | -- (addr[2] << 16) | (addr[3] << 24); -- addr_hi = addr[4] | (addr[5] << 8); -- -- ret = lan78xx_write_reg(dev, RX_ADDRL, addr_lo); -- ret = lan78xx_write_reg(dev, RX_ADDRH, addr_hi); -+ if (((lan78xx_read_eeprom(dev, EEPROM_MAC_OFFSET, -+ ETH_ALEN, addr) == 0) || -+ (lan78xx_read_otp(dev, EEPROM_MAC_OFFSET, -+ ETH_ALEN, addr) == 0)) && -+ is_valid_ether_addr(addr)) { -+ /* eeprom values are valid so use them */ -+ netif_dbg(dev, ifup, dev->net, -+ "MAC address read from EEPROM"); - } else { - /* generate random MAC */ - random_ether_addr(addr); - netif_dbg(dev, ifup, dev->net, - "MAC address set to random addr"); - } -+ -+ addr_lo = addr[0] | (addr[1] << 8) | -+ (addr[2] << 16) | (addr[3] << 24); -+ addr_hi = addr[4] | (addr[5] << 8); -+ -+ ret = lan78xx_write_reg(dev, RX_ADDRL, addr_lo); -+ ret = lan78xx_write_reg(dev, RX_ADDRH, addr_hi); - } - - ret = lan78xx_write_reg(dev, MAF_LO(0), addr_lo); -@@ -1685,6 +1678,10 @@ int lan78xx_set_mac_addr(struct net_device *netdev, void *p) - ret = lan78xx_write_reg(dev, RX_ADDRL, addr_lo); - ret = lan78xx_write_reg(dev, RX_ADDRH, addr_hi); - -+ /* Added to support MAC address changes */ -+ ret = lan78xx_write_reg(dev, MAF_LO(0), addr_lo); -+ ret = lan78xx_write_reg(dev, MAF_HI(0), addr_hi | MAF_HI_VALID_); -+ - return 0; - } - --- -2.17.1 - diff --git a/recipes-kernel/linux/linux-raspberrypi-4.4/enable-usb-lan78xx.cfg b/recipes-kernel/linux/linux-raspberrypi-4.4/enable-usb-lan78xx.cfg deleted file mode 100644 index 9cb0f27b98a..00000000000 --- a/recipes-kernel/linux/linux-raspberrypi-4.4/enable-usb-lan78xx.cfg +++ /dev/null @@ -1 +0,0 @@ -CONFIG_USB_LAN78XX=y diff --git a/recipes-kernel/linux/linux-raspberrypi_4.4.bbappend b/recipes-kernel/linux/linux-raspberrypi_4.4.bbappend deleted file mode 100644 index c75b7be31f4..00000000000 --- a/recipes-kernel/linux/linux-raspberrypi_4.4.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2019 LG Electronics, Inc. - -SHRT_VER = "${@oe.utils.trim_version('${PV}', 2)}" -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-${SHRT_VER}:" - -SRC_URI_append = " \ - file://0018-Add-device-tree-support-for-raspberry-pi-3B.patch \ - file://0019-lan78xx-Resolve-issue-with-changing-MAC-address.patch \ - file://enable-usb-lan78xx.cfg \ -"