Browse code Merge branch 'for-next/imx' Conflicts: arch/arm/boards/dmo-mx6-realq7/lowlevel.c WIP_next-LS master next stable/v2014.05 stable/v2014.06 stable/v2014.07 stable/v2014.08 stable/v2014.09 stable/v2014.10 stable/v2014.11 stable/v2014.12 stable/v2015.01 stable/v2015.02 stable/v2017.05 stable/v2017.06 stable/v2017.07 stable/v2017.11 stable/v2018.07 stable/v2018.09 stable/v2018.12 work/fit-support v2020.07.0 v2020.06.0 v2020.05.0 v2020.04.0 v2020.03.0 v2020.02.0 v2020.01.0 v2019.12.0 v2019.11.0 v2019.10.0 v2019.09.0 v2019.08.1 v2019.08.0 v2019.07.0 v2019.06.1 v2019.06.0 v2019.05.0 v2019.04.0 v2019.03.0 v2019.02.0 v2019.01.0 v2018.12.0 v2018.11.0 v2018.10.0 v2018.09.1 v2018.09.0 v2018.08.1 v2018.08.0 v2018.07.2 v2018.07.1 v2018.07.0 v2018.06.0 v2018.05.0 v2018.04.0 v2018.03.0 v2018.02.0 v2018.01.0 v2017.12.0 v2017.11.0 v2017.10.0 v2017.09.0 v2017.08.0 v2017.07.1 v2017.07.0 v2017.06.2 v2017.06.1 v2017.06.0 v2017.05.4 v2017.05.3 v2017.05.2 v2017.05.1 v2017.05.0 v2017.04.0 v2017.03.0 v2017.02.0 v2017.01.0 v2016.11.0 v2016.10.0 v2016.09.0 v2016.08.0 v2016.07.0 v2016.06.0 v2016.05.0 v2016.04.0 v2016.03.0 v2016.02.0 v2016.01.0 v2015.12.0 v2015.11.0 v2015.10.0 v2015.09.0 v2015.08.0 v2015.07.0 v2015.06.0 v2015.05.0 v2015.04.0 v2015.03.0 v2015.02.0 v2015.01.0 v2014.12.0 v2014.11.0 v2014.10.0 v2014.09.0 v2014.08.0 v2014.07.0 v2014.06.0 v2014.05.0 v2014.04.0 v2014.03.0

commit c224cd316197132321869d859048f89da49c0162 2 parents 3cbd92b + cc66cf1 Sascha Hauer authored on 3 Feb 2014

Showing 123 changed files

• arch/arm/boards/Makefile
• arch/arm/boards/boundarydevices-nitrogen6x/Makefile
• arch/arm/boards/boundarydevices-nitrogen6x/board.c
• arch/arm/boards/boundarydevices-nitrogen6x/env/config-board
• arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6x-1g.imxcfg
• arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c
• arch/arm/boards/dfi-fs700-m60/Makefile
• arch/arm/boards/dfi-fs700-m60/board.c
• arch/arm/boards/dfi-fs700-m60/flash-header-fs700-m60-6q-micron.imxcfg
• arch/arm/boards/dfi-fs700-m60/flash-header-fs700-m60-6q-nanya.imxcfg
• arch/arm/boards/dfi-fs700-m60/flash-header-fs700-m60-6q.imxcfg
• arch/arm/boards/dfi-fs700-m60/flash-header-fs700-m60-6s.imxcfg
• arch/arm/boards/dfi-fs700-m60/lowlevel.c
• arch/arm/boards/dmo-mx6-realq7/board.c
• arch/arm/boards/dmo-mx6-realq7/lowlevel.c
• arch/arm/boards/efika-mx-smartbook/env/config
• arch/arm/boards/eukrea_cpuimx25/lowlevel.c
• arch/arm/boards/eukrea_cpuimx27/lowlevel_init.S
• arch/arm/boards/eukrea_cpuimx35/lowlevel.c
• arch/arm/boards/freescale-mx25-3-stack/lowlevel_init.S
• arch/arm/boards/freescale-mx35-3-stack/lowlevel_init.S
• arch/arm/boards/freescale-mx51-pdk/board.c
• arch/arm/boards/freescale-mx53-loco/lowlevel.c
• arch/arm/boards/freescale-mx53-vmx53/board.c
• arch/arm/boards/freescale-mx6-sabrelite/board.c
• arch/arm/boards/freescale-mx6-sabrelite/lowlevel.c
• arch/arm/boards/guf-cupid/lowlevel.c
• arch/arm/boards/guf-neso/lowlevel.c
• arch/arm/boards/imx21ads/lowlevel_init.S
• arch/arm/boards/karo-tx25/board.c
• arch/arm/boards/karo-tx25/env/init/mtdparts-nand
• arch/arm/boards/karo-tx25/lowlevel.c
• arch/arm/boards/pcm037/lowlevel.c
• arch/arm/boards/pcm038/lowlevel.c
• arch/arm/boards/pcm043/lowlevel.c
• arch/arm/boards/phycard-i.MX27/Makefile
• arch/arm/boards/phycard-i.MX27/env/config
• arch/arm/boards/phycard-i.MX27/lowlevel.c
• arch/arm/boards/phycard-i.MX27/lowlevel_init.S
• arch/arm/boards/phycard-i.MX27/pca100.c
• arch/arm/boards/solidrun-carrier-1/Makefile
• arch/arm/boards/solidrun-carrier-1/board.c
• arch/arm/boards/solidrun-carrier-1/flash-header-solidrun-carrier-1.imxcfg
• arch/arm/boards/solidrun-carrier-1/lowlevel.c
• arch/arm/boards/solidrun-hummingboard/Makefile
• arch/arm/boards/solidrun-hummingboard/board.c
• arch/arm/boards/solidrun-hummingboard/flash-header-solidrun-hummingboard.imxcfg
• arch/arm/boards/solidrun-hummingboard/lowlevel.c
• arch/arm/boards/tqma53/Makefile
• arch/arm/boards/tqma53/board.c
• arch/arm/boards/tqma53/flash-header-tq-tqma53-1gib.imxcfg
• arch/arm/boards/tqma53/flash-header-tq-tqma53-512mib.imxcfg
• arch/arm/boards/tqma53/flash-header-tq-tqma53.h
• arch/arm/boards/tqma53/flash_header.c
• arch/arm/boards/tqma53/lowlevel.c
• arch/arm/configs/imx_v7_defconfig
• arch/arm/configs/pca100_defconfig
• arch/arm/configs/tqma53_defconfig
• arch/arm/configs/tx25stk5_defconfig
• arch/arm/dts/Makefile
• arch/arm/dts/imx25-karo-tx25.dts
• arch/arm/dts/imx25-pinfunc.h
• arch/arm/dts/imx25.dtsi
• arch/arm/dts/imx27-phytec-phycard-s-rdk.dts
• arch/arm/dts/imx27-phytec-phycard-s-som.dts
• arch/arm/dts/imx27-pinfunc.h
• arch/arm/dts/imx27-pingrp.h
• arch/arm/dts/imx27.dtsi
• arch/arm/dts/imx51-babbage.dts
• arch/arm/dts/imx51-genesi-efika-sb.dts
• arch/arm/dts/imx51-pingrp.h
• arch/arm/dts/imx51.dtsi
• arch/arm/dts/imx53-mba53.dts
• arch/arm/dts/imx53-qsb-common.dtsi
• arch/arm/dts/imx53-qsb.dts
• arch/arm/dts/imx53-qsrb.dts
• arch/arm/dts/imx53-tqma53.dtsi
• arch/arm/dts/imx6dl-cubox-i-carrier-1.dts
• arch/arm/dts/imx6dl-hummingboard.dts
• arch/arm/dts/imx6dl-nitrogen6x.dts
• arch/arm/dts/imx6dl-pinfunc.h
• arch/arm/dts/imx6dl-sabrelite.dts
• arch/arm/dts/imx6dl.dtsi
• arch/arm/dts/imx6q-dmo-edmqmx6.dts
• arch/arm/dts/imx6q-dmo-realq7.dts
• arch/arm/dts/imx6q-gk802.dts
• arch/arm/dts/imx6q-nitrogen6x.dts
• arch/arm/dts/imx6q-phytec-pfla02.dtsi
• arch/arm/dts/imx6q-pinfunc.h
• arch/arm/dts/imx6q-sabrelite.dts
• arch/arm/dts/imx6q-sabresd.dts
• arch/arm/dts/imx6q.dtsi
• arch/arm/dts/imx6qdl-dfi-fs700-m60.dtsi
• arch/arm/dts/imx6qdl-mba6x.dtsi
• arch/arm/dts/imx6qdl-microsom.dtsi
• arch/arm/dts/imx6qdl-nitrogen6x.dtsi
• arch/arm/dts/imx6qdl-pingrp.h
• arch/arm/dts/imx6qdl-sabrelite.dtsi
• arch/arm/dts/imx6qdl-sabresd.dtsi
• arch/arm/dts/imx6qdl-tqma6x.dtsi
• arch/arm/dts/imx6qdl.dtsi
• arch/arm/lib/pbl.lds.S
• arch/arm/mach-imx/Kconfig
• arch/arm/mach-imx/clk-imx25.c
• arch/arm/mach-imx/clk-imx27.c
• arch/arm/mach-imx/clocksource.c
• arch/arm/mach-imx/external-nand-boot.c
• arch/arm/mach-imx/imx6.c
• arch/arm/mach-imx/include/mach/imx-gpio.h
• arch/arm/mach-imx/include/mach/imx-nand.h
• arch/arm/mach-imx/include/mach/imx25-regs.h
• arch/arm/mach-imx/include/mach/imx6.h
• arch/arm/pbl/Makefile
• drivers/mci/imx-esdhc.c
• drivers/mci/imx.c
• drivers/pinctrl/Kconfig
• drivers/pinctrl/imx-iomux-v1.c
• images/Makefile
• images/Makefile.imx
• include/dt-bindings/clock/imx5-clock.h
• include/dt-bindings/input/input.h
• include/dt-bindings/interrupt-controller/irq.h
• scripts/fix_size.c

Ignore Space Show notes View arch/arm/boards/Makefile
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/boundarydevices-nitrogen6x/Makefile 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/boundarydevices-nitrogen6x/board.c 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/boundarydevices-nitrogen6x/env/config-board 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6x-1g.imxcfg 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/dfi-fs700-m60/Makefile
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/dfi-fs700-m60/board.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/dfi-fs700-m60/flash-header-fs700-m60-6q-micron.imxcfg 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/dfi-fs700-m60/flash-header-fs700-m60-6q-nanya.imxcfg 0 → 100644
Too large (Show diff)

Show notes View arch/arm/boards/dfi-fs700-m60/flash-header-fs700-m60-6q.imxcfg 100644 → 0
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/dfi-fs700-m60/flash-header-fs700-m60-6s.imxcfg
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/dfi-fs700-m60/lowlevel.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/dmo-mx6-realq7/board.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/dmo-mx6-realq7/lowlevel.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/efika-mx-smartbook/env/config
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/eukrea_cpuimx25/lowlevel.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/eukrea_cpuimx27/lowlevel_init.S
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/eukrea_cpuimx35/lowlevel.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/freescale-mx25-3-stack/lowlevel_init.S
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/freescale-mx35-3-stack/lowlevel_init.S
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/freescale-mx51-pdk/board.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/freescale-mx53-loco/lowlevel.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/freescale-mx53-vmx53/board.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/freescale-mx6-sabrelite/board.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/freescale-mx6-sabrelite/lowlevel.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/guf-cupid/lowlevel.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/guf-neso/lowlevel.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/imx21ads/lowlevel_init.S
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/karo-tx25/board.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/karo-tx25/env/init/mtdparts-nand
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/karo-tx25/lowlevel.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/pcm037/lowlevel.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/pcm038/lowlevel.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/pcm043/lowlevel.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/phycard-i.MX27/Makefile
Too large (Show diff)

Show notes View arch/arm/boards/phycard-i.MX27/env/config 100644 → 0
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/phycard-i.MX27/lowlevel.c 0 → 100644
Too large (Show diff)

Show notes View arch/arm/boards/phycard-i.MX27/lowlevel_init.S 100644 → 0
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/phycard-i.MX27/pca100.c
Too large (Show diff)

Show notes View arch/arm/boards/solidrun-carrier-1/Makefile 100644 → 0
Too large (Show diff)

Show notes View arch/arm/boards/solidrun-carrier-1/board.c 100644 → 0
Too large (Show diff)

Show notes View arch/arm/boards/solidrun-carrier-1/flash-header-solidrun-carrier-1.imxcfg 100644 → 0
Too large (Show diff)

Show notes View arch/arm/boards/solidrun-carrier-1/lowlevel.c 100644 → 0
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/solidrun-hummingboard/Makefile 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/solidrun-hummingboard/board.c 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/solidrun-hummingboard/flash-header-solidrun-hummingboard.imxcfg 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/solidrun-hummingboard/lowlevel.c 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/tqma53/Makefile
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/tqma53/board.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/tqma53/flash-header-tq-tqma53-1gib.imxcfg 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/tqma53/flash-header-tq-tqma53-512mib.imxcfg 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/tqma53/flash-header-tq-tqma53.h 0 → 100644
Too large (Show diff)

Show notes View arch/arm/boards/tqma53/flash_header.c 100644 → 0
Too large (Show diff)

Ignore Space Show notes View arch/arm/boards/tqma53/lowlevel.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/configs/imx_v7_defconfig
Too large (Show diff)

Ignore Space Show notes View arch/arm/configs/pca100_defconfig
Too large (Show diff)

Ignore Space Show notes View arch/arm/configs/tqma53_defconfig
Too large (Show diff)

Ignore Space Show notes View arch/arm/configs/tx25stk5_defconfig
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/Makefile
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx25-karo-tx25.dts 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx25-pinfunc.h 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx25.dtsi 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx27-phytec-phycard-s-rdk.dts 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx27-phytec-phycard-s-som.dts 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx27-pinfunc.h 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx27-pingrp.h 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx27.dtsi 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx51-babbage.dts
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx51-genesi-efika-sb.dts
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx51-pingrp.h 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx51.dtsi
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx53-mba53.dts 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx53-qsb-common.dtsi 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx53-qsb.dts
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx53-qsrb.dts 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx53-tqma53.dtsi 0 → 100644
Too large (Show diff)

Show notes View arch/arm/dts/imx6dl-cubox-i-carrier-1.dts 100644 → 0
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx6dl-hummingboard.dts 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx6dl-nitrogen6x.dts 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx6dl-pinfunc.h
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx6dl-sabrelite.dts 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx6dl.dtsi
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx6q-dmo-edmqmx6.dts 0 → 100644
Too large (Show diff)

Show notes View arch/arm/dts/imx6q-dmo-realq7.dts 100644 → 0
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx6q-gk802.dts
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx6q-nitrogen6x.dts 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx6q-phytec-pfla02.dtsi
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx6q-pinfunc.h
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx6q-sabrelite.dts
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx6q-sabresd.dts
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx6q.dtsi
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx6qdl-dfi-fs700-m60.dtsi
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx6qdl-mba6x.dtsi
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx6qdl-microsom.dtsi
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx6qdl-nitrogen6x.dtsi 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx6qdl-pingrp.h 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx6qdl-sabrelite.dtsi 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx6qdl-sabresd.dtsi
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx6qdl-tqma6x.dtsi
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx6qdl.dtsi
Too large (Show diff)

Ignore Space Show notes View arch/arm/lib/pbl.lds.S
Too large (Show diff)

Ignore Space Show notes View arch/arm/mach-imx/Kconfig
Too large (Show diff)

Ignore Space Show notes View arch/arm/mach-imx/clk-imx25.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/mach-imx/clk-imx27.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/mach-imx/clocksource.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/mach-imx/external-nand-boot.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/mach-imx/imx6.c
Too large (Show diff)

Ignore Space Show notes View arch/arm/mach-imx/include/mach/imx-gpio.h 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/mach-imx/include/mach/imx-nand.h
Too large (Show diff)

Ignore Space Show notes View arch/arm/mach-imx/include/mach/imx25-regs.h
Too large (Show diff)

Ignore Space Show notes View arch/arm/mach-imx/include/mach/imx6.h
Too large (Show diff)

Ignore Space Show notes View arch/arm/pbl/Makefile
Too large (Show diff)

Ignore Space Show notes View drivers/mci/imx-esdhc.c
Too large (Show diff)

Ignore Space Show notes View drivers/mci/imx.c
Too large (Show diff)

Ignore Space Show notes View drivers/pinctrl/Kconfig
Too large (Show diff)

Ignore Space Show notes View drivers/pinctrl/imx-iomux-v1.c
Too large (Show diff)

Ignore Space Show notes View images/Makefile
Too large (Show diff)

Ignore Space Show notes View images/Makefile.imx
Too large (Show diff)

Ignore Space Show notes View include/dt-bindings/clock/imx5-clock.h 0 → 100644
Too large (Show diff)

Ignore Space Show notes View include/dt-bindings/input/input.h 0 → 100644
Too large (Show diff)

Ignore Space Show notes View include/dt-bindings/interrupt-controller/irq.h 0 → 100644
Too large (Show diff)

Ignore Space Show notes View scripts/fix_size.c
Too large (Show diff)

Show line notes below