diff options
Diffstat (limited to 'target/linux/sunxi')
19 files changed, 20 insertions, 123 deletions
diff --git a/target/linux/sunxi/patches-3.18/100-dt-sun7i-add_spi0_pins_a.patch b/target/linux/sunxi/patches-3.18/100-dt-sun7i-add_spi0_pins_a.patch index f0e3eea..b81ed44 100644 --- a/target/linux/sunxi/patches-3.18/100-dt-sun7i-add_spi0_pins_a.patch +++ b/target/linux/sunxi/patches-3.18/100-dt-sun7i-add_spi0_pins_a.patch @@ -8,8 +8,6 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com> arch/arm/boot/dts/sun7i-a20.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) -diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi -index 82097c9..4fb8930 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -784,6 +784,13 @@ diff --git a/target/linux/sunxi/patches-3.18/101-dt-sun7i-add-uart3_pins.patch b/target/linux/sunxi/patches-3.18/101-dt-sun7i-add-uart3_pins.patch index 8f9c0e8..284537a 100644 --- a/target/linux/sunxi/patches-3.18/101-dt-sun7i-add-uart3_pins.patch +++ b/target/linux/sunxi/patches-3.18/101-dt-sun7i-add-uart3_pins.patch @@ -11,8 +11,6 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com> arch/arm/boot/dts/sun7i-a20.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) -diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi -index 4fb8930..cecf32c 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -677,6 +677,13 @@ diff --git a/target/linux/sunxi/patches-3.18/102-dt-sun7i-add_mmc2_pins.patch b/target/linux/sunxi/patches-3.18/102-dt-sun7i-add_mmc2_pins.patch index 6a5878e..28128db 100644 --- a/target/linux/sunxi/patches-3.18/102-dt-sun7i-add_mmc2_pins.patch +++ b/target/linux/sunxi/patches-3.18/102-dt-sun7i-add_mmc2_pins.patch @@ -8,8 +8,6 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com> arch/arm/boot/dts/sun7i-a20.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) -diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi -index cecf32c..f0a75c6 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -833,6 +833,13 @@ diff --git a/target/linux/sunxi/patches-3.18/110-input-add-sun4i-lradc.patch b/target/linux/sunxi/patches-3.18/110-input-add-sun4i-lradc.patch index 0772f15..12b4628 100644 --- a/target/linux/sunxi/patches-3.18/110-input-add-sun4i-lradc.patch +++ b/target/linux/sunxi/patches-3.18/110-input-add-sun4i-lradc.patch @@ -27,9 +27,6 @@ Changes in v2: create mode 100644 Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt create mode 100644 drivers/input/keyboard/sun4i-lradc-keys.c -diff --git a/Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt b/Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt -new file mode 100644 -index 0000000..b9c32f6 --- /dev/null +++ b/Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt @@ -0,0 +1,62 @@ @@ -95,11 +92,9 @@ index 0000000..b9c32f6 + voltage = <987387>; + }; + }; -diff --git a/MAINTAINERS b/MAINTAINERS -index a20df9b..73d1aef 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -8932,6 +8932,13 @@ F: arch/m68k/sun3*/ +@@ -9002,6 +9002,13 @@ F: arch/m68k/sun3*/ F: arch/m68k/include/asm/sun3* F: drivers/net/ethernet/i825xx/sun3* @@ -113,8 +108,6 @@ index a20df9b..73d1aef 100644 SUNDANCE NETWORK DRIVER M: Denis Kirjanov <kda@linux-powerpc.org> L: netdev@vger.kernel.org -diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig -index a3958c6..2d11b44 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -567,6 +567,16 @@ config KEYBOARD_STMPE @@ -134,11 +127,9 @@ index a3958c6..2d11b44 100644 config KEYBOARD_DAVINCI tristate "TI DaVinci Key Scan" depends on ARCH_DAVINCI_DM365 -diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile -index 0a33456..a35269a 100644 --- a/drivers/input/keyboard/Makefile +++ b/drivers/input/keyboard/Makefile -@@ -53,6 +53,7 @@ obj-$(CONFIG_KEYBOARD_SPEAR) += spear-keyboard.o +@@ -53,6 +53,7 @@ obj-$(CONFIG_KEYBOARD_SPEAR) += spear-k obj-$(CONFIG_KEYBOARD_STMPE) += stmpe-keypad.o obj-$(CONFIG_KEYBOARD_STOWAWAY) += stowaway.o obj-$(CONFIG_KEYBOARD_ST_KEYSCAN) += st-keyscan.o @@ -146,9 +137,6 @@ index 0a33456..a35269a 100644 obj-$(CONFIG_KEYBOARD_SUNKBD) += sunkbd.o obj-$(CONFIG_KEYBOARD_TC3589X) += tc3589x-keypad.o obj-$(CONFIG_KEYBOARD_TEGRA) += tegra-kbc.o -diff --git a/drivers/input/keyboard/sun4i-lradc-keys.c b/drivers/input/keyboard/sun4i-lradc-keys.c -new file mode 100644 -index 0000000..f11f002 --- /dev/null +++ b/drivers/input/keyboard/sun4i-lradc-keys.c @@ -0,0 +1,258 @@ diff --git a/target/linux/sunxi/patches-3.18/111-dt-sun4i-add-lradc.patch b/target/linux/sunxi/patches-3.18/111-dt-sun4i-add-lradc.patch index 0ffe4e8..d2298a4 100644 --- a/target/linux/sunxi/patches-3.18/111-dt-sun4i-add-lradc.patch +++ b/target/linux/sunxi/patches-3.18/111-dt-sun4i-add-lradc.patch @@ -8,8 +8,6 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com> arch/arm/boot/dts/sun4i-a10.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) -diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi -index 380f914..1ef7d57 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -669,6 +669,13 @@ diff --git a/target/linux/sunxi/patches-3.18/112-dt-sun5i-add-lradc.patch b/target/linux/sunxi/patches-3.18/112-dt-sun5i-add-lradc.patch index 22dfe51..edc9016 100644 --- a/target/linux/sunxi/patches-3.18/112-dt-sun5i-add-lradc.patch +++ b/target/linux/sunxi/patches-3.18/112-dt-sun5i-add-lradc.patch @@ -11,8 +11,6 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com> arch/arm/boot/dts/sun5i-a13.dtsi | 7 ++++ 4 files changed, 100 insertions(+), 4 deletions(-) -diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts -index ea9519d..0b82d20 100644 --- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts +++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts @@ -12,8 +12,9 @@ @@ -74,8 +72,6 @@ index ea9519d..0b82d20 100644 uart0: serial@01c28000 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pins_a>; -diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi -index 531272c..7c6c883 100644 --- a/arch/arm/boot/dts/sun5i-a10s.dtsi +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi @@ -520,6 +520,13 @@ @@ -92,8 +88,6 @@ index 531272c..7c6c883 100644 sid: eeprom@01c23800 { compatible = "allwinner,sun4i-a10-sid"; reg = <0x01c23800 0x10>; -diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts -index 429994e..b4ec8eb 100644 --- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts +++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts @@ -12,8 +12,9 @@ @@ -155,8 +149,6 @@ index 429994e..b4ec8eb 100644 uart1: serial@01c28400 { pinctrl-names = "default"; pinctrl-0 = <&uart1_pins_b>; -diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi -index b131068..aa0482c 100644 --- a/arch/arm/boot/dts/sun5i-a13.dtsi +++ b/arch/arm/boot/dts/sun5i-a13.dtsi @@ -468,6 +468,13 @@ diff --git a/target/linux/sunxi/patches-3.18/113-dt-sun7i-add-lradc.patch b/target/linux/sunxi/patches-3.18/113-dt-sun7i-add-lradc.patch index 50a66b6..ae2c383 100644 --- a/target/linux/sunxi/patches-3.18/113-dt-sun7i-add-lradc.patch +++ b/target/linux/sunxi/patches-3.18/113-dt-sun7i-add-lradc.patch @@ -9,8 +9,6 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com> arch/arm/boot/dts/sun7i-a20.dtsi | 7 +++ 2 files changed, 64 insertions(+), 2 deletions(-) -diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts -index 9d669cdf..c00badd 100644 --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts @@ -12,8 +12,9 @@ @@ -86,8 +84,6 @@ index 9d669cdf..c00badd 100644 uart0: serial@01c28000 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pins_a>; -diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi -index f0a75c6..9174423 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -911,6 +911,13 @@ diff --git a/target/linux/sunxi/patches-3.18/115-input-sun4i-ts-update-temp-curve.patch b/target/linux/sunxi/patches-3.18/115-input-sun4i-ts-update-temp-curve.patch index bff74e4..331c93b 100644 --- a/target/linux/sunxi/patches-3.18/115-input-sun4i-ts-update-temp-curve.patch +++ b/target/linux/sunxi/patches-3.18/115-input-sun4i-ts-update-temp-curve.patch @@ -23,8 +23,6 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com> drivers/input/touchscreen/sun4i-ts.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) -diff --git a/Documentation/devicetree/bindings/input/touchscreen/sun4i.txt b/Documentation/devicetree/bindings/input/touchscreen/sun4i.txt -index aef5779..5106709 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/sun4i.txt +++ b/Documentation/devicetree/bindings/input/touchscreen/sun4i.txt @@ -2,7 +2,7 @@ sun4i resistive touchscreen controller @@ -36,8 +34,6 @@ index aef5779..5106709 100644 - reg: mmio address range of the chip - interrupts: interrupt to which the chip is connected -diff --git a/drivers/input/touchscreen/sun4i-ts.c b/drivers/input/touchscreen/sun4i-ts.c -index 2ba8260..52b7114 100644 --- a/drivers/input/touchscreen/sun4i-ts.c +++ b/drivers/input/touchscreen/sun4i-ts.c @@ -111,6 +111,8 @@ struct sun4i_ts_data { @@ -49,7 +45,7 @@ index 2ba8260..52b7114 100644 }; static void sun4i_ts_irq_handle_input(struct sun4i_ts_data *ts, u32 reg_val) -@@ -189,7 +191,8 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *devattr, +@@ -189,7 +191,8 @@ static ssize_t show_temp(struct device * if (ts->temp_data == -1) return -EAGAIN; @@ -59,7 +55,7 @@ index 2ba8260..52b7114 100644 } static ssize_t show_temp_label(struct device *dev, -@@ -224,6 +227,13 @@ static int sun4i_ts_probe(struct platform_device *pdev) +@@ -224,6 +227,13 @@ static int sun4i_ts_probe(struct platfor ts->dev = dev; ts->ignore_fifo_data = true; ts->temp_data = -1; @@ -73,7 +69,7 @@ index 2ba8260..52b7114 100644 ts_attached = of_property_read_bool(np, "allwinner,ts-attached"); if (ts_attached) { -@@ -318,6 +328,7 @@ static int sun4i_ts_remove(struct platform_device *pdev) +@@ -318,6 +328,7 @@ static int sun4i_ts_remove(struct platfo static const struct of_device_id sun4i_ts_of_match[] = { { .compatible = "allwinner,sun4i-a10-ts", }, diff --git a/target/linux/sunxi/patches-3.18/116-dt-sunxi-update-compats-for-tempcurves.patch b/target/linux/sunxi/patches-3.18/116-dt-sunxi-update-compats-for-tempcurves.patch index 861538f..fe8dcdb 100644 --- a/target/linux/sunxi/patches-3.18/116-dt-sunxi-update-compats-for-tempcurves.patch +++ b/target/linux/sunxi/patches-3.18/116-dt-sunxi-update-compats-for-tempcurves.patch @@ -16,8 +16,6 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com> arch/arm/boot/dts/sun7i-a20.dtsi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi -index 7c6c883..7089284 100644 --- a/arch/arm/boot/dts/sun5i-a10s.dtsi +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi @@ -533,7 +533,7 @@ @@ -29,8 +27,6 @@ index 7c6c883..7089284 100644 reg = <0x01c25000 0x100>; interrupts = <29>; }; -diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi -index aa0482c..b05ab04 100644 --- a/arch/arm/boot/dts/sun5i-a13.dtsi +++ b/arch/arm/boot/dts/sun5i-a13.dtsi @@ -481,7 +481,7 @@ @@ -42,8 +38,6 @@ index aa0482c..b05ab04 100644 reg = <0x01c25000 0x100>; interrupts = <29>; }; -diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi -index 9174423..81d4e55 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -924,7 +924,7 @@ diff --git a/target/linux/sunxi/patches-3.18/130-input-add-axp20x-pek.patch b/target/linux/sunxi/patches-3.18/130-input-add-axp20x-pek.patch index 537ba36..28ed6a3 100644 --- a/target/linux/sunxi/patches-3.18/130-input-add-axp20x-pek.patch +++ b/target/linux/sunxi/patches-3.18/130-input-add-axp20x-pek.patch @@ -16,8 +16,6 @@ Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> 3 files changed, 293 insertions(+) create mode 100644 drivers/input/misc/axp20x-pek.c -diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig -index 23297ab..a49bcd3 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig @@ -404,6 +404,17 @@ config INPUT_RETU_PWRBUTTON @@ -38,11 +36,9 @@ index 23297ab..a49bcd3 100644 config INPUT_TWL4030_PWRBUTTON tristate "TWL4030 Power button Driver" depends on TWL4030_CORE -diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile -index 19c7603..04ea87f 100644 --- a/drivers/input/misc/Makefile +++ b/drivers/input/misc/Makefile -@@ -54,6 +54,7 @@ obj-$(CONFIG_INPUT_POWERMATE) += powermate.o +@@ -54,6 +54,7 @@ obj-$(CONFIG_INPUT_POWERMATE) += powerm obj-$(CONFIG_INPUT_PWM_BEEPER) += pwm-beeper.o obj-$(CONFIG_INPUT_RB532_BUTTON) += rb532_button.o obj-$(CONFIG_INPUT_RETU_PWRBUTTON) += retu-pwrbutton.o @@ -50,9 +46,6 @@ index 19c7603..04ea87f 100644 obj-$(CONFIG_INPUT_GPIO_ROTARY_ENCODER) += rotary_encoder.o obj-$(CONFIG_INPUT_SGI_BTNS) += sgi_btns.o obj-$(CONFIG_INPUT_SIRFSOC_ONKEY) += sirfsoc-onkey.o -diff --git a/drivers/input/misc/axp20x-pek.c b/drivers/input/misc/axp20x-pek.c -new file mode 100644 -index 0000000..0fba252 --- /dev/null +++ b/drivers/input/misc/axp20x-pek.c @@ -0,0 +1,281 @@ diff --git a/target/linux/sunxi/patches-3.18/150-pwm-add-sunxi-driver.patch b/target/linux/sunxi/patches-3.18/150-pwm-add-sunxi-driver.patch index 2d467c0..49560c3 100644 --- a/target/linux/sunxi/patches-3.18/150-pwm-add-sunxi-driver.patch +++ b/target/linux/sunxi/patches-3.18/150-pwm-add-sunxi-driver.patch @@ -1,8 +1,6 @@ -diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig -index 3865dfb9ed08..424359d3cbb1 100644 --- a/drivers/pwm/Kconfig +++ b/drivers/pwm/Kconfig -@@ -262,6 +262,15 @@ config PWM_STI +@@ -263,6 +263,15 @@ config PWM_STI To compile this driver as a module, choose M here: the module will be called pwm-sti. @@ -18,11 +16,9 @@ index 3865dfb9ed08..424359d3cbb1 100644 config PWM_TEGRA tristate "NVIDIA Tegra PWM support" depends on ARCH_TEGRA -diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile -index c458606c3755..d607804deea1 100644 --- a/drivers/pwm/Makefile +++ b/drivers/pwm/Makefile -@@ -24,6 +24,7 @@ obj-$(CONFIG_PWM_ROCKCHIP) += pwm-rockchip.o +@@ -24,6 +24,7 @@ obj-$(CONFIG_PWM_ROCKCHIP) += pwm-rockch obj-$(CONFIG_PWM_SAMSUNG) += pwm-samsung.o obj-$(CONFIG_PWM_SPEAR) += pwm-spear.o obj-$(CONFIG_PWM_STI) += pwm-sti.o @@ -30,9 +26,6 @@ index c458606c3755..d607804deea1 100644 obj-$(CONFIG_PWM_TEGRA) += pwm-tegra.o obj-$(CONFIG_PWM_TIECAP) += pwm-tiecap.o obj-$(CONFIG_PWM_TIEHRPWM) += pwm-tiehrpwm.o -diff --git a/drivers/pwm/pwm-sun4i.c b/drivers/pwm/pwm-sun4i.c -new file mode 100644 -index 000000000000..918f8ee79b51 --- /dev/null +++ b/drivers/pwm/pwm-sun4i.c @@ -0,0 +1,371 @@ diff --git a/target/linux/sunxi/patches-3.18/200-mmc-add-sdio-function-subnode.patch b/target/linux/sunxi/patches-3.18/200-mmc-add-sdio-function-subnode.patch index 6427df5..d2a1504 100644 --- a/target/linux/sunxi/patches-3.18/200-mmc-add-sdio-function-subnode.patch +++ b/target/linux/sunxi/patches-3.18/200-mmc-add-sdio-function-subnode.patch @@ -20,8 +20,6 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com> drivers/mmc/core/sdio_bus.c | 11 +++++++++++ 4 files changed, 46 insertions(+) -diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c -index 8a1f124..7868565 100644 --- a/drivers/mmc/core/bus.c +++ b/drivers/mmc/core/bus.c @@ -16,6 +16,7 @@ @@ -41,7 +39,7 @@ index 8a1f124..7868565 100644 ret = device_add(&card->dev); if (ret) return ret; -@@ -380,6 +383,7 @@ void mmc_remove_card(struct mmc_card *card) +@@ -380,6 +383,7 @@ void mmc_remove_card(struct mmc_card *ca mmc_hostname(card->host), card->rca); } device_del(&card->dev); @@ -49,8 +47,6 @@ index 8a1f124..7868565 100644 } put_device(&card->dev); -diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c -index f26a5f1..7f7f66c 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1205,6 +1205,34 @@ EXPORT_SYMBOL(mmc_of_parse_voltage); @@ -88,8 +84,6 @@ index f26a5f1..7f7f66c 100644 #ifdef CONFIG_REGULATOR /** -diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h -index 443a5846..f712f6e 100644 --- a/drivers/mmc/core/core.h +++ b/drivers/mmc/core/core.h @@ -32,6 +32,9 @@ struct mmc_bus_ops { @@ -102,8 +96,6 @@ index 443a5846..f712f6e 100644 void mmc_init_erase(struct mmc_card *card); void mmc_set_chip_select(struct mmc_host *host, int mode); -diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c -index 6da97b1..f63223a 100644 --- a/drivers/mmc/core/sdio_bus.c +++ b/drivers/mmc/core/sdio_bus.c @@ -22,7 +22,9 @@ @@ -116,7 +108,7 @@ index 6da97b1..f63223a 100644 #include "sdio_cis.h" #include "sdio_bus.h" -@@ -303,6 +305,13 @@ static void sdio_acpi_set_handle(struct sdio_func *func) +@@ -303,6 +305,13 @@ static void sdio_acpi_set_handle(struct static inline void sdio_acpi_set_handle(struct sdio_func *func) {} #endif @@ -130,7 +122,7 @@ index 6da97b1..f63223a 100644 /* * Register a new SDIO function with the driver model. */ -@@ -312,6 +321,7 @@ int sdio_add_func(struct sdio_func *func) +@@ -312,6 +321,7 @@ int sdio_add_func(struct sdio_func *func dev_set_name(&func->dev, "%s:%d", mmc_card_id(func->card), func->num); @@ -138,7 +130,7 @@ index 6da97b1..f63223a 100644 sdio_acpi_set_handle(func); ret = device_add(&func->dev); if (ret == 0) { -@@ -335,6 +345,7 @@ void sdio_remove_func(struct sdio_func *func) +@@ -335,6 +345,7 @@ void sdio_remove_func(struct sdio_func * dev_pm_domain_detach(&func->dev, false); device_del(&func->dev); diff --git a/target/linux/sunxi/patches-3.18/201-dt-sun7i-add-oob-irq-to-bcm-sdio-wifi.patch b/target/linux/sunxi/patches-3.18/201-dt-sun7i-add-oob-irq-to-bcm-sdio-wifi.patch index c6790b7..e2cfeb7 100644 --- a/target/linux/sunxi/patches-3.18/201-dt-sun7i-add-oob-irq-to-bcm-sdio-wifi.patch +++ b/target/linux/sunxi/patches-3.18/201-dt-sun7i-add-oob-irq-to-bcm-sdio-wifi.patch @@ -10,8 +10,6 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com> arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 11 +++++++++++ 2 files changed, 22 insertions(+) -diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts -index a6c1a3c..f9ab5d4 100644 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts @@ -31,12 +31,23 @@ @@ -38,8 +36,6 @@ index a6c1a3c..f9ab5d4 100644 }; usbphy: phy@01c13400 { -diff --git a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts -index 6a67712d..f620aea 100644 --- a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts +++ b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts @@ -29,12 +29,23 @@ diff --git a/target/linux/sunxi/patches-3.18/202-dt-sun7i-add-bluetooth-to-cubietruck.patch b/target/linux/sunxi/patches-3.18/202-dt-sun7i-add-bluetooth-to-cubietruck.patch index f819849..9c0d969 100644 --- a/target/linux/sunxi/patches-3.18/202-dt-sun7i-add-bluetooth-to-cubietruck.patch +++ b/target/linux/sunxi/patches-3.18/202-dt-sun7i-add-bluetooth-to-cubietruck.patch @@ -14,8 +14,6 @@ GPIO, but this is not supported in this patch. arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 36 ++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) -diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts -index f9ab5d4..69d8c4c 100644 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts @@ -103,6 +103,20 @@ diff --git a/target/linux/sunxi/patches-3.18/270-dt-sun7i-add-ss-to-a20.patch b/target/linux/sunxi/patches-3.18/270-dt-sun7i-add-ss-to-a20.patch index 11a6ed0..f03e2d9 100644 --- a/target/linux/sunxi/patches-3.18/270-dt-sun7i-add-ss-to-a20.patch +++ b/target/linux/sunxi/patches-3.18/270-dt-sun7i-add-ss-to-a20.patch @@ -1,6 +1,6 @@ --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi -@@ -529,6 +529,14 @@ +@@ -577,6 +577,14 @@ status = "disabled"; }; diff --git a/target/linux/sunxi/patches-3.18/271-crypto-add-ss.patch b/target/linux/sunxi/patches-3.18/271-crypto-add-ss.patch index 090624d..0788c6f 100644 --- a/target/linux/sunxi/patches-3.18/271-crypto-add-ss.patch +++ b/target/linux/sunxi/patches-3.18/271-crypto-add-ss.patch @@ -1,8 +1,6 @@ -diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig -index 2fb0fdf..9ba9759 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig -@@ -436,4 +436,21 @@ config CRYPTO_DEV_QCE +@@ -437,4 +437,21 @@ config CRYPTO_DEV_QCE hardware. To compile this driver as a module, choose M here. The module will be called qcrypto. @@ -24,26 +22,18 @@ index 2fb0fdf..9ba9759 100644 + will be called sunxi-ss. + endif # CRYPTO_HW -diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile -index 3924f93..856545c 100644 --- a/drivers/crypto/Makefile +++ b/drivers/crypto/Makefile -@@ -25,3 +25,4 @@ obj-$(CONFIG_CRYPTO_DEV_TALITOS) += talitos.o +@@ -25,3 +25,4 @@ obj-$(CONFIG_CRYPTO_DEV_TALITOS) += tali obj-$(CONFIG_CRYPTO_DEV_UX500) += ux500/ obj-$(CONFIG_CRYPTO_DEV_QAT) += qat/ obj-$(CONFIG_CRYPTO_DEV_QCE) += qce/ +obj-$(CONFIG_CRYPTO_DEV_SUNXI_SS) += sunxi-ss/ -diff --git a/drivers/crypto/sunxi-ss/Makefile b/drivers/crypto/sunxi-ss/Makefile -new file mode 100644 -index 0000000..8bb287d --- /dev/null +++ b/drivers/crypto/sunxi-ss/Makefile @@ -0,0 +1,2 @@ +obj-$(CONFIG_CRYPTO_DEV_SUNXI_SS) += sunxi-ss.o +sunxi-ss-y += sunxi-ss-core.o sunxi-ss-hash.o sunxi-ss-cipher.o -diff --git a/drivers/crypto/sunxi-ss/sunxi-ss-cipher.c b/drivers/crypto/sunxi-ss/sunxi-ss-cipher.c -new file mode 100644 -index 0000000..8d0416e --- /dev/null +++ b/drivers/crypto/sunxi-ss/sunxi-ss-cipher.c @@ -0,0 +1,489 @@ @@ -536,9 +526,6 @@ index 0000000..8d0416e + memcpy(op->key, key, keylen); + return 0; +} -diff --git a/drivers/crypto/sunxi-ss/sunxi-ss-core.c b/drivers/crypto/sunxi-ss/sunxi-ss-core.c -new file mode 100644 -index 0000000..e66d7e2 --- /dev/null +++ b/drivers/crypto/sunxi-ss/sunxi-ss-core.c @@ -0,0 +1,318 @@ @@ -860,9 +847,6 @@ index 0000000..e66d7e2 +MODULE_DESCRIPTION("Allwinner Security System cryptographic accelerator"); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Corentin LABBE <clabbe.montjoie@gmail.com>"); -diff --git a/drivers/crypto/sunxi-ss/sunxi-ss-hash.c b/drivers/crypto/sunxi-ss/sunxi-ss-hash.c -new file mode 100644 -index 0000000..ec8758f --- /dev/null +++ b/drivers/crypto/sunxi-ss/sunxi-ss-hash.c @@ -0,0 +1,445 @@ @@ -1311,9 +1295,6 @@ index 0000000..ec8758f + + return sunxi_hash_final(areq); +} -diff --git a/drivers/crypto/sunxi-ss/sunxi-ss.h b/drivers/crypto/sunxi-ss/sunxi-ss.h -new file mode 100644 -index 0000000..331e75b --- /dev/null +++ b/drivers/crypto/sunxi-ss/sunxi-ss.h @@ -0,0 +1,193 @@ diff --git a/target/linux/sunxi/patches-3.18/300-dt-sun7i-add-bananapi.patch b/target/linux/sunxi/patches-3.18/300-dt-sun7i-add-bananapi.patch index 0ee3195..c60b1fe 100644 --- a/target/linux/sunxi/patches-3.18/300-dt-sun7i-add-bananapi.patch +++ b/target/linux/sunxi/patches-3.18/300-dt-sun7i-add-bananapi.patch @@ -16,8 +16,6 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com> 2 files changed, 215 insertions(+) create mode 100644 arch/arm/boot/dts/sun7i-a20-bananapi.dts -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 38c89ca..63422bd 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -435,6 +435,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \ @@ -28,9 +26,6 @@ index 38c89ca..63422bd 100644 sun7i-a20-cubieboard2.dtb \ sun7i-a20-cubietruck.dtb \ sun7i-a20-hummingbird.dtb \ -diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts -new file mode 100644 -index 0000000..0e7c9f5 --- /dev/null +++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts @@ -0,0 +1,214 @@ diff --git a/target/linux/sunxi/patches-3.18/301-dt-sun7i-add-bananapro.patch b/target/linux/sunxi/patches-3.18/301-dt-sun7i-add-bananapro.patch index 70283a5..c8cdb1d 100644 --- a/target/linux/sunxi/patches-3.18/301-dt-sun7i-add-bananapro.patch +++ b/target/linux/sunxi/patches-3.18/301-dt-sun7i-add-bananapro.patch @@ -15,21 +15,16 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com> 2 files changed, 262 insertions(+) create mode 100644 arch/arm/boot/dts/sun7i-a20-bananapro.dts -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 40d2901..b3dcf3f 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -466,6 +466,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \ - sun6i-a31s-cs908.dtb +@@ -436,6 +436,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \ + sun6i-a31-m9.dtb dtb-$(CONFIG_MACH_SUN7I) += \ sun7i-a20-bananapi.dtb \ + sun7i-a20-bananapro.dtb \ sun7i-a20-cubieboard2.dtb \ sun7i-a20-cubietruck.dtb \ sun7i-a20-hummingbird.dtb \ -diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts -new file mode 100644 -index 0000000..3b4764d --- /dev/null +++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts @@ -0,0 +1,261 @@ diff --git a/target/linux/sunxi/patches-3.18/302-dt-sun7i-add-lamobo-r1.patch b/target/linux/sunxi/patches-3.18/302-dt-sun7i-add-lamobo-r1.patch index 82c8bd5..5d5ba11 100644 --- a/target/linux/sunxi/patches-3.18/302-dt-sun7i-add-lamobo-r1.patch +++ b/target/linux/sunxi/patches-3.18/302-dt-sun7i-add-lamobo-r1.patch @@ -1,7 +1,5 @@ -Index: linux-3.18.2/arch/arm/boot/dts/Makefile -=================================================================== ---- linux-3.18.2.orig/arch/arm/boot/dts/Makefile -+++ linux-3.18.2/arch/arm/boot/dts/Makefile +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile @@ -441,6 +441,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ sun7i-a20-cubietruck.dtb \ sun7i-a20-hummingbird.dtb \ @@ -10,10 +8,8 @@ Index: linux-3.18.2/arch/arm/boot/dts/Makefile sun7i-a20-olinuxino-lime.dtb \ sun7i-a20-olinuxino-micro.dtb \ sun7i-a20-pcduino3.dtb -Index: linux-3.18.2/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts -=================================================================== --- /dev/null -+++ linux-3.18.2/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts ++++ b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts @@ -0,0 +1,235 @@ +/* + * Copyright 2015 Daniel Golle <daniel@makrotopia.org> |