Browse code Merge branch 'for-next/imx' Conflicts: arch/arm/configs/tx25stk5_defconfig WIP_next-LS master next 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

commit 6ec2780419cb1c656a61b29385dc134a06cae287 2 parents 1022dfe + 999802c Sascha Hauer authored on 4 Jun 2014

Showing 63 changed files

• arch/arm/boards/boundarydevices-nitrogen6x/board.c
• arch/arm/boards/datamodul-edm-qmx6/board.c
• arch/arm/boards/dfi-fs700-m60/board.c
• arch/arm/boards/efika-mx-smartbook/board.c
• arch/arm/boards/embest-riotboard/board.c
• arch/arm/boards/freescale-mx51-babbage/board.c
• arch/arm/boards/freescale-mx53-qsb/board.c
• arch/arm/boards/freescale-mx53-vmx53/board.c
• arch/arm/boards/freescale-mx6-sabrelite/board.c
• arch/arm/boards/guf-santaro/board.c
• arch/arm/boards/guf-vincell/board.c
• arch/arm/boards/karo-tx53/board.c
• arch/arm/boards/karo-tx53/dcd-data-1011.h
• arch/arm/boards/karo-tx53/dcd-data-xx30.h
• arch/arm/boards/phytec-phycard-imx27/lowlevel.c
• arch/arm/boards/solidrun-hummingboard/board.c
• arch/arm/boards/tqma53/board.c
• arch/arm/boards/tqma6x/board.c
• arch/arm/configs/imx_defconfig
• arch/arm/configs/phytec-phycard-imx27_defconfig
• arch/arm/configs/tx25stk5_defconfig
• arch/arm/dts/Makefile
• arch/arm/dts/imx27-phytec-phycard-s-rdk-bb.dts
• arch/arm/dts/imx27-phytec-phycard-s-rdk.dts
• arch/arm/dts/imx27-phytec-phycard-s-som.dtsi
• arch/arm/dts/imx51-babbage.dts
• arch/arm/dts/imx51-genesi-efika-sb.dts
• 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-voipac-bsb.dts
• arch/arm/dts/imx53.dtsi
• arch/arm/dts/imx6dl-hummingboard.dts
• arch/arm/dts/imx6q-gk802.dts
• arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi
• arch/arm/dts/imx6q-var-custom.dts
• arch/arm/dts/imx6q-var-som.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-udoo.dtsi
• arch/arm/dts/imx6qdl.dtsi
• arch/arm/dts/imx6s-riotboard.dts
• arch/arm/mach-imx/Kconfig
• arch/arm/mach-imx/clk-imx5.c
• arch/arm/mach-imx/clk-pllv2.c
• arch/arm/mach-imx/imx-bbu-internal.c
• arch/arm/mach-imx/include/mach/bbu.h
• arch/arm/mach-imx/include/mach/imx51-regs.h
• arch/arm/mach-imx/include/mach/imx53-regs.h
• drivers/mfd/mc13xxx.c
• drivers/pinctrl/imx-iomux-v3.c
• drivers/spi/imx_spi.c
• drivers/video/imx-ipu-v3/imx-ldb.c
• drivers/video/imx-ipu-v3/ipu-common.c
• images/Makefile.imx
• include/mfd/mc13xxx.h

Ignore Space Show notes View arch/arm/boards/boundarydevices-nitrogen6x/board.c

Ignore Space Show notes View arch/arm/boards/datamodul-edm-qmx6/board.c

Ignore Space Show notes View arch/arm/boards/dfi-fs700-m60/board.c

Ignore Space Show notes View arch/arm/boards/efika-mx-smartbook/board.c

Ignore Space Show notes View arch/arm/boards/embest-riotboard/board.c

Ignore Space Show notes View arch/arm/boards/freescale-mx51-babbage/board.c

Ignore Space Show notes View arch/arm/boards/freescale-mx53-qsb/board.c

Ignore Space Show notes View arch/arm/boards/freescale-mx53-vmx53/board.c

Ignore Space Show notes View arch/arm/boards/freescale-mx6-sabrelite/board.c

Ignore Space Show notes View arch/arm/boards/guf-santaro/board.c

Ignore Space Show notes View arch/arm/boards/guf-vincell/board.c

Ignore Space Show notes View arch/arm/boards/karo-tx53/board.c

Show notes View arch/arm/boards/karo-tx53/dcd-data-1011.h 100644 → 0

Show notes View arch/arm/boards/karo-tx53/dcd-data-xx30.h 100644 → 0

Ignore Space Show notes View arch/arm/boards/phytec-phycard-imx27/lowlevel.c

Ignore Space Show notes View arch/arm/boards/solidrun-hummingboard/board.c

Ignore Space Show notes View arch/arm/boards/tqma53/board.c

Ignore Space Show notes View arch/arm/boards/tqma6x/board.c

Ignore Space Show notes View arch/arm/configs/imx_defconfig 0 → 100644

Show notes View arch/arm/configs/phytec-phycard-imx27_defconfig 100644 → 0

Show notes View arch/arm/configs/tx25stk5_defconfig 100644 → 0

Ignore Space Show notes View arch/arm/dts/Makefile

Ignore Space Show notes View arch/arm/dts/imx27-phytec-phycard-s-rdk-bb.dts

Show notes View arch/arm/dts/imx27-phytec-phycard-s-rdk.dts 100644 → 0

Show notes View arch/arm/dts/imx27-phytec-phycard-s-som.dtsi 100644 → 0

Ignore Space Show notes View arch/arm/dts/imx51-babbage.dts

Ignore Space Show notes View arch/arm/dts/imx51-genesi-efika-sb.dts

Ignore Space Show notes View arch/arm/dts/imx53-mba53.dts

Ignore Space Show notes View arch/arm/dts/imx53-qsb-common.dtsi

Ignore Space Show notes View arch/arm/dts/imx53-qsb.dts

Ignore Space Show notes View arch/arm/dts/imx53-qsrb.dts

Ignore Space Show notes View arch/arm/dts/imx53-voipac-bsb.dts

Ignore Space Show notes View arch/arm/dts/imx53.dtsi

Ignore Space Show notes View arch/arm/dts/imx6dl-hummingboard.dts

Ignore Space Show notes View arch/arm/dts/imx6q-gk802.dts

Ignore Space Show notes View arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi

Ignore Space Show notes View arch/arm/dts/imx6q-var-custom.dts

Ignore Space Show notes View arch/arm/dts/imx6q-var-som.dtsi

Ignore Space Show notes View arch/arm/dts/imx6qdl-dfi-fs700-m60.dtsi

Ignore Space Show notes View arch/arm/dts/imx6qdl-mba6x.dtsi

Ignore Space Show notes View arch/arm/dts/imx6qdl-microsom.dtsi

Ignore Space Show notes View arch/arm/dts/imx6qdl-nitrogen6x.dtsi

Show notes View arch/arm/dts/imx6qdl-pingrp.h 100644 → 0

Ignore Space Show notes View arch/arm/dts/imx6qdl-sabrelite.dtsi

Ignore Space Show notes View arch/arm/dts/imx6qdl-sabresd.dtsi

Ignore Space Show notes View arch/arm/dts/imx6qdl-tqma6x.dtsi

Ignore Space Show notes View arch/arm/dts/imx6qdl-udoo.dtsi

Ignore Space Show notes View arch/arm/dts/imx6qdl.dtsi

Ignore Space Show notes View arch/arm/dts/imx6s-riotboard.dts

Ignore Space Show notes View arch/arm/mach-imx/Kconfig

Ignore Space Show notes View arch/arm/mach-imx/clk-imx5.c

Ignore Space Show notes View arch/arm/mach-imx/clk-pllv2.c

Ignore Space Show notes View arch/arm/mach-imx/imx-bbu-internal.c

Ignore Space Show notes View arch/arm/mach-imx/include/mach/bbu.h

Ignore Space Show notes View arch/arm/mach-imx/include/mach/imx51-regs.h

Ignore Space Show notes View arch/arm/mach-imx/include/mach/imx53-regs.h

Ignore Space Show notes View drivers/mfd/mc13xxx.c

Ignore Space Show notes View drivers/pinctrl/imx-iomux-v3.c

Ignore Space Show notes View drivers/spi/imx_spi.c

Ignore Space Show notes View drivers/video/imx-ipu-v3/imx-ldb.c

Ignore Space Show notes View drivers/video/imx-ipu-v3/ipu-common.c

Ignore Space Show notes View images/Makefile.imx

Ignore Space Show notes View include/mfd/mc13xxx.h

Show line notes below