Browse code Merge branch 'for-next/bcm2835' Conflicts: arch/arm/configs/versatilepb_defconfig WIP_next-LS master next stable/v2013.05 stable/v2013.06 stable/v2013.07 stable/v2013.08 stable/v2013.10 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 v2014.02.0 v2014.01.0 v2013.12.0 v2013.11.0 v2013.10.1 v2013.10.0 v2013.09.0 v2013.08.1 v2013.08.0 v2013.07.0 v2013.06.1 v2013.06.0 v2013.05.1 v2013.05.0 v2013.04.0 v2013.03.0 v2013.02.0 v2013.01.0 v2012.12.1 v2012.12.0

commit daac8bf5d3bd5e157c66d753eac0d5efb47aa145 2 parents 2f5cd85 + 33f59d8 Sascha Hauer authored on 16 Nov 2012

Showing 44 changed files

• arch/arm/Kconfig
• arch/arm/Makefile
• arch/arm/boards/raspberry-pi/Makefile
• arch/arm/boards/raspberry-pi/config.h
• arch/arm/boards/raspberry-pi/env/init/bootargs-base
• arch/arm/boards/raspberry-pi/env/init/hostname
• arch/arm/boards/raspberry-pi/rpi.c
• arch/arm/configs/rpi_defconfig
• arch/arm/configs/versatilepb_defconfig
• arch/arm/cpu/Kconfig
• arch/arm/mach-bcm2835/Kconfig
• arch/arm/mach-bcm2835/Makefile
• arch/arm/mach-bcm2835/core.c
• arch/arm/mach-bcm2835/include/mach/clkdev.h
• arch/arm/mach-bcm2835/include/mach/core.h
• arch/arm/mach-bcm2835/include/mach/gpio.h
• arch/arm/mach-bcm2835/include/mach/platform.h
• arch/arm/mach-bcm2835/include/mach/wd.h
• arch/arm/mach-ep93xx/include/mach/gpio.h
• arch/arm/mach-imx/include/mach/gpio.h
• arch/arm/mach-mxs/include/mach/gpio.h
• arch/arm/mach-nomadik/8815.c
• arch/arm/mach-nomadik/include/mach/mtu.h
• arch/arm/mach-nomadik/include/mach/timex.h
• arch/arm/mach-nomadik/timer.c
• arch/arm/mach-omap/include/mach/gpio.h
• arch/arm/mach-samsung/include/mach/gpio.h
• arch/arm/mach-versatile/core.c
• arch/arm/mach-versatile/include/mach/gpio.h
• drivers/Kconfig
• drivers/Makefile
• drivers/clk/clkdev.c
• drivers/clocksource/Kconfig
• drivers/clocksource/Makefile
• drivers/clocksource/arm_smp_twd.c
• drivers/clocksource/bcm2835.c
• drivers/clocksource/nomadik.c
• drivers/gpio/Kconfig
• drivers/gpio/Makefile
• drivers/gpio/gpio-bcm2835.c
• drivers/gpio/gpio-pl061.c
• include/asm-generic/gpio.h
• include/linux/amba/pl061.h
• include/linux/clkdev.h

Ignore Space Show notes View arch/arm/Kconfig

Ignore Space Show notes View arch/arm/Makefile

Ignore Space Show notes View arch/arm/boards/raspberry-pi/Makefile 0 → 100644

Ignore Space Show notes View arch/arm/boards/raspberry-pi/config.h 0 → 100644

Ignore Space Show notes View arch/arm/boards/raspberry-pi/env/init/bootargs-base 0 → 100644

Ignore Space Show notes View arch/arm/boards/raspberry-pi/env/init/hostname 0 → 100644

Ignore Space Show notes View arch/arm/boards/raspberry-pi/rpi.c 0 → 100644

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

Ignore Space Show notes View arch/arm/configs/versatilepb_defconfig

Ignore Space Show notes View arch/arm/cpu/Kconfig

Ignore Space Show notes View arch/arm/mach-bcm2835/Kconfig 0 → 100644

Ignore Space Show notes View arch/arm/mach-bcm2835/Makefile 0 → 100644

Ignore Space Show notes View arch/arm/mach-bcm2835/core.c 0 → 100644

Ignore Space Show notes View arch/arm/mach-bcm2835/include/mach/clkdev.h 0 → 100644

Ignore Space Show notes View arch/arm/mach-bcm2835/include/mach/core.h 0 → 100644

Ignore Space Show notes View arch/arm/mach-bcm2835/include/mach/gpio.h 0 → 100644

Ignore Space Show notes View arch/arm/mach-bcm2835/include/mach/platform.h 0 → 100644

Ignore Space Show notes View arch/arm/mach-bcm2835/include/mach/wd.h 0 → 100644

Ignore Space Show notes View arch/arm/mach-ep93xx/include/mach/gpio.h

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

Ignore Space Show notes View arch/arm/mach-mxs/include/mach/gpio.h

Ignore Space Show notes View arch/arm/mach-nomadik/8815.c

Show notes View arch/arm/mach-nomadik/include/mach/mtu.h 100644 → 0

Show notes View arch/arm/mach-nomadik/include/mach/timex.h 100644 → 0

Ignore Space Show notes View arch/arm/mach-nomadik/timer.c

Ignore Space Show notes View arch/arm/mach-omap/include/mach/gpio.h

Ignore Space Show notes View arch/arm/mach-samsung/include/mach/gpio.h

Ignore Space Show notes View arch/arm/mach-versatile/core.c

Ignore Space Show notes View arch/arm/mach-versatile/include/mach/gpio.h 0 → 100644

Ignore Space Show notes View drivers/Kconfig

Ignore Space Show notes View drivers/Makefile

Ignore Space Show notes View drivers/clk/clkdev.c

Ignore Space Show notes View drivers/clocksource/Kconfig 0 → 100644

Ignore Space Show notes View drivers/clocksource/Makefile 0 → 100644

Ignore Space Show notes View drivers/clocksource/arm_smp_twd.c 0 → 100644

Ignore Space Show notes View drivers/clocksource/bcm2835.c 0 → 100644

Ignore Space Show notes View drivers/clocksource/nomadik.c 0 → 100644

Ignore Space Show notes View drivers/gpio/Kconfig

Ignore Space Show notes View drivers/gpio/Makefile

Ignore Space Show notes View drivers/gpio/gpio-bcm2835.c 0 → 100644

Ignore Space Show notes View drivers/gpio/gpio-pl061.c 0 → 100644

Ignore Space Show notes View include/asm-generic/gpio.h 0 → 100644

Ignore Space Show notes View include/linux/amba/pl061.h 0 → 100644

Ignore Space Show notes View include/linux/clkdev.h

Show line notes below