diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-08-14 13:06:33 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-08-14 13:06:33 +0000 |
| commit | 098f187e7870684bfaaa53a1fdfc9682cc1e0dae (patch) | |
| tree | e4f67db9483b1ce0d774fc67ab46a18171579338 /target/linux/sunxi/patches-4.1/126-2-dt-sun5i-add-nand-ctrlpin-defs.patch | |
| parent | bbf13d61b7377b5114d9c716b7326f3f2bc468c1 (diff) | |
| download | master-187ad058-098f187e7870684bfaaa53a1fdfc9682cc1e0dae.tar.gz master-187ad058-098f187e7870684bfaaa53a1fdfc9682cc1e0dae.tar.bz2 master-187ad058-098f187e7870684bfaaa53a1fdfc9682cc1e0dae.zip | |
kernel: update 4.1 to 4.1.5
Changelog:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.5
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46598 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/sunxi/patches-4.1/126-2-dt-sun5i-add-nand-ctrlpin-defs.patch')
| -rw-r--r-- | target/linux/sunxi/patches-4.1/126-2-dt-sun5i-add-nand-ctrlpin-defs.patch | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/target/linux/sunxi/patches-4.1/126-2-dt-sun5i-add-nand-ctrlpin-defs.patch b/target/linux/sunxi/patches-4.1/126-2-dt-sun5i-add-nand-ctrlpin-defs.patch index 290dbb762e..3193a6a3de 100644 --- a/target/linux/sunxi/patches-4.1/126-2-dt-sun5i-add-nand-ctrlpin-defs.patch +++ b/target/linux/sunxi/patches-4.1/126-2-dt-sun5i-add-nand-ctrlpin-defs.patch @@ -11,13 +11,11 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com> arch/arm/boot/dts/sun5i.dtsi | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) -diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi -index f11efb7..1962ec9 100644 --- a/arch/arm/boot/dts/sun5i-a10s.dtsi +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi -@@ -201,6 +201,20 @@ - allwinner,drive = <SUN4I_PINCTRL_30_MA>; - allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; +@@ -656,4 +656,18 @@ + clocks = <&ahb_gates 28>; + }; }; + + nand_cs2_pins_a: nand_cs@2 { @@ -34,15 +32,11 @@ index f11efb7..1962ec9 100644 + allwinner,pull = <0>; + }; }; - - &sram_a { -diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi -index 772f8d8..0dc7c96 100644 --- a/arch/arm/boot/dts/sun5i-a13.dtsi +++ b/arch/arm/boot/dts/sun5i-a13.dtsi -@@ -544,6 +544,44 @@ +@@ -528,6 +528,44 @@ allwinner,drive = <SUN4I_PINCTRL_30_MA>; - allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; }; + + nand_pins_a: nand_base0@0 { |